fix config bug

This commit is contained in:
Jun Kurihara 2022-07-05 23:05:33 +09:00
commit 11db5507ff
No known key found for this signature in database
GPG key ID: 48ADFD173ED22B03
6 changed files with 17 additions and 4 deletions

5
.dockerignore Normal file
View file

@ -0,0 +1,5 @@
target/
bench/
.vscode/
.private/
.github/

View file

@ -32,7 +32,8 @@ RUN apt-get update && apt-get install -qy --no-install-recommends $BUILD_DEPS &&
rm -fr ~/.cargo ~/.rustup && \
rm -fr /tmp/* /var/tmp/* /var/cache/apt/* /var/lib/apt/lists/* /var/log/apt/* /var/log/*.log &&\
rm -fr ~/.cargo ~/.rustup && \
rm -fr /tmp/* /var/tmp/* /var/cache/apt/* /var/lib/apt/lists/* /var/log/apt/* /var/log/*.log
rm -fr /tmp/* /var/tmp/* /var/cache/apt/* /var/lib/apt/lists/* /var/log/apt/* /var/log/*.log &&\
mkdir -p /var/log/rpxy && touch /var/log/rpxy/rpxy.log
COPY docker-bin/run.sh /
COPY docker-bin/entrypoint.sh /
@ -40,7 +41,7 @@ COPY docker-bin/entrypoint.sh /
RUN chmod 755 /run.sh && \
chmod 755 /entrypoint.sh
EXPOSE 53/udp 53/tcp
EXPOSE 80 443
CMD ["/entrypoint.sh"]

View file

@ -45,7 +45,7 @@ reverse_proxy = [
] },
]
# Optional: TLS setting. if https_port is specified and tls is true above, this must be given.
tls = { https_redirection = true, tls_cert_path = 'localhost.pem', tls_cert_key_path = 'localhost.pem' }
tls = { https_redirection = true, tls_cert_path = './localhost.pem', tls_cert_key_path = './localhost.pem' }
## List of destinations to send data to.

View file

@ -5,8 +5,12 @@ services:
container_name: rpxy
restart: unless-stopped
ports:
- 127.0.0.1:8080:8080
- 127.0.0.1:8080:80
- 127.0.0.1:8443:443
build:
context: ./
tty: false
privileged: true
volumes:
- ./localhost.pem:/localhost.pem:ro
- ./config-example.toml:/etc/rpxy.toml:ro

View file

@ -43,6 +43,8 @@ pub fn parse_opts(globals: &mut Globals, backends: &mut Backends) -> Result<()>
if let Some(v) = config.listen_only_ipv6 {
if v {
listen_addresses.extend(LISTEN_ADDRESSES_V6.iter());
} else {
listen_addresses.extend(LISTEN_ADDRESSES_V4.iter());
}
} else if let Some(v) = config.listen_ipv6 {
listen_addresses.extend(LISTEN_ADDRESSES_V4.iter());

View file

@ -10,6 +10,7 @@ where
T: Connect + Clone + Sync + Send + 'static,
{
pub async fn client_serve_h3(self, conn: quinn::Connecting) -> Result<()> {
// TODO: client数の管理
let client_addr = conn.remote_address();
match conn.await {