From 7f3c5b245dc021781bd9484a08777b94cbb1334c Mon Sep 17 00:00:00 2001 From: casjay Date: Mon, 6 Jan 2025 17:14:41 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh --- Dockerfile | 2 +- rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh | 11 +++++++---- rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh | 12 ++++++------ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a3e82f..44c65f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG USER="root" ARG SHELL_OPTS="set -e -o pipefail" ARG SERVICE_PORT="80" -ARG EXPOSE_PORTS="80 8118 9040 9050 9053 9080 58000-58004" +ARG EXPOSE_PORTS="80 8118 9040 9050 9053 9080 57000-57010" ARG PHP_VERSION="system" ARG NODE_VERSION="system" ARG NODE_MANAGER="system" diff --git a/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh b/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh index 61bd8c9..ba2af99 100755 --- a/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh +++ b/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh @@ -263,14 +263,17 @@ Log notice file $LOG_DIR/tor-relay.log SOCKSPort 10051 ServerTransportPlugin obfs4 exec /usr/bin/lyrebird -ServerTransportListenAddr obfs4 0.0.0.0:${TOR_RELAY_PORT:-58004} +ServerTransportListenAddr obfs4 0.0.0.0:${TOR_RELAY_PORT:-57000} +ORPort ${TOR_RELAY_OR_PORT:-57001} +DirPort ${TOR_RELAY_DIR_PORT:-57002} BridgeRelay 0 PublishServerDescriptor 1 -ContactInfo ${TOR_ADMIN:-tor-admin@$HOSTNAME} -Nickname ${TOR_NICK_NAME:-$RANDOM_NICK}-relay -AccountingMax ${TOR_ACCOUNT_MAX:-1000} GBytes +ContactInfo ${TOR_RELAY_ADMIN:-tor-admin@$HOSTNAME} +Nickname ${TOR_RELAY_NICK_NAME:-$RANDOM_NICK} +AccountingMax ${TOR_RELAY_ACCOUNT_MAX:-1000} AccountingStart month 1 00:00 +DirPortFrontPage /usr/share/tor/html/exit.html %include $CONF_DIR/conf.d/*.conf EOF diff --git a/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh b/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh index 9ac5bfc..26b8423 100755 --- a/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh +++ b/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh @@ -263,17 +263,17 @@ Log notice file $LOG_DIR/tor-bridge.log SOCKSPort 10052 ServerTransportPlugin obfs4 exec /usr/bin/lyrebird -ServerTransportListenAddr obfs4 0.0.0.0:${TOR_BRIDGE_PT_PORT:-58000} +ServerTransportListenAddr obfs4 0.0.0.0:${TOR_BRIDGE_PT_PORT:-57003} +ORPort ${TOR_BRIDGE_OR_PORT:-57004} +DirPort ${TOR_BRIDGE_DIR_PORT:-57005} +Nickname ${TOR_BRIDGE_NICK_NAME:-$RANDOM_NICK} +ContactInfo ${TOR_BRIDGE_ADMIN:-tor-admin@$HOSTNAME} +AccountingMax ${TOR_BRIDGE_ACCOUNT_MAX:-1000} BridgeRelay 1 PublishServerDescriptor 1 ExtORPort auto Exitpolicy accept *:* -ORPort ${TOR_BRIDGE_OR_PORT:-58001} -DirPort ${TOR_BRIDGE_DIR_PORT:-58002} -Nickname ${TOR_NICK_NAME:-$RANDOM_NICK} -ContactInfo ${TOR_ADMIN:-tor-admin@$HOSTNAME} -AccountingMax ${TOR_ACCOUNT_MAX:-1000} GBytes AccountingStart month 1 00:00 DirPortFrontPage /usr/share/tor/html/exit.html %include $CONF_DIR/conf.d/*.conf