fix config bug
This commit is contained in:
parent
baa23e5925
commit
11db5507ff
6 changed files with 17 additions and 4 deletions
5
.dockerignore
Normal file
5
.dockerignore
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
target/
|
||||||
|
bench/
|
||||||
|
.vscode/
|
||||||
|
.private/
|
||||||
|
.github/
|
||||||
|
|
@ -32,7 +32,8 @@ RUN apt-get update && apt-get install -qy --no-install-recommends $BUILD_DEPS &&
|
||||||
rm -fr ~/.cargo ~/.rustup && \
|
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 &&\
|
||||||
rm -fr ~/.cargo ~/.rustup && \
|
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/run.sh /
|
||||||
COPY docker-bin/entrypoint.sh /
|
COPY docker-bin/entrypoint.sh /
|
||||||
|
|
@ -40,7 +41,7 @@ COPY docker-bin/entrypoint.sh /
|
||||||
RUN chmod 755 /run.sh && \
|
RUN chmod 755 /run.sh && \
|
||||||
chmod 755 /entrypoint.sh
|
chmod 755 /entrypoint.sh
|
||||||
|
|
||||||
EXPOSE 53/udp 53/tcp
|
EXPOSE 80 443
|
||||||
|
|
||||||
CMD ["/entrypoint.sh"]
|
CMD ["/entrypoint.sh"]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ reverse_proxy = [
|
||||||
] },
|
] },
|
||||||
]
|
]
|
||||||
# Optional: TLS setting. if https_port is specified and tls is true above, this must be given.
|
# 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.
|
## List of destinations to send data to.
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,12 @@ services:
|
||||||
container_name: rpxy
|
container_name: rpxy
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
ports:
|
ports:
|
||||||
- 127.0.0.1:8080:8080
|
- 127.0.0.1:8080:80
|
||||||
|
- 127.0.0.1:8443:443
|
||||||
|
build:
|
||||||
|
context: ./
|
||||||
tty: false
|
tty: false
|
||||||
privileged: true
|
privileged: true
|
||||||
volumes:
|
volumes:
|
||||||
|
- ./localhost.pem:/localhost.pem:ro
|
||||||
- ./config-example.toml:/etc/rpxy.toml:ro
|
- ./config-example.toml:/etc/rpxy.toml:ro
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,8 @@ pub fn parse_opts(globals: &mut Globals, backends: &mut Backends) -> Result<()>
|
||||||
if let Some(v) = config.listen_only_ipv6 {
|
if let Some(v) = config.listen_only_ipv6 {
|
||||||
if v {
|
if v {
|
||||||
listen_addresses.extend(LISTEN_ADDRESSES_V6.iter());
|
listen_addresses.extend(LISTEN_ADDRESSES_V6.iter());
|
||||||
|
} else {
|
||||||
|
listen_addresses.extend(LISTEN_ADDRESSES_V4.iter());
|
||||||
}
|
}
|
||||||
} else if let Some(v) = config.listen_ipv6 {
|
} else if let Some(v) = config.listen_ipv6 {
|
||||||
listen_addresses.extend(LISTEN_ADDRESSES_V4.iter());
|
listen_addresses.extend(LISTEN_ADDRESSES_V4.iter());
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,7 @@ where
|
||||||
T: Connect + Clone + Sync + Send + 'static,
|
T: Connect + Clone + Sync + Send + 'static,
|
||||||
{
|
{
|
||||||
pub async fn client_serve_h3(self, conn: quinn::Connecting) -> Result<()> {
|
pub async fn client_serve_h3(self, conn: quinn::Connecting) -> Result<()> {
|
||||||
|
// TODO: client数の管理
|
||||||
let client_addr = conn.remote_address();
|
let client_addr = conn.remote_address();
|
||||||
|
|
||||||
match conn.await {
|
match conn.await {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue