From 5cfac94cb46702ec4a9f3f1fa66c14ff5e394fce Mon Sep 17 00:00:00 2001 From: casjay Date: Mon, 6 Jan 2025 17:02:26 -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 rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh --- rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh | 3 +++ rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) 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 0bb2c9a..61bd8c9 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 @@ -267,7 +267,10 @@ ServerTransportListenAddr obfs4 0.0.0.0:${TOR_RELAY_PORT:-58004} BridgeRelay 0 PublishServerDescriptor 1 +ContactInfo ${TOR_ADMIN:-tor-admin@$HOSTNAME} Nickname ${TOR_NICK_NAME:-$RANDOM_NICK}-relay +AccountingMax ${TOR_ACCOUNT_MAX:-1000} GBytes +AccountingStart month 1 00:00 %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 caa5e90..9ac5bfc 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,14 +263,14 @@ Log notice file $LOG_DIR/tor-bridge.log SOCKSPort 10052 ServerTransportPlugin obfs4 exec /usr/bin/lyrebird -ServerTransportListenAddr obfs4 0.0.0.0:${TOR_PT_PORT:-58000} +ServerTransportListenAddr obfs4 0.0.0.0:${TOR_BRIDGE_PT_PORT:-58000} BridgeRelay 1 PublishServerDescriptor 1 ExtORPort auto Exitpolicy accept *:* -ORPort ${TOR_OR_PORT:-58001} -DirPort ${TOR_DIR_PORT:-58002} +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