From 52adfd70eda94bb44ad1d6589c1cd668015be864 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.pro>
Date: Thu, 16 Jan 2025 12:11:02 -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/01-tor-bridge.sh
rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh
---
 rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh | 10 +++++++---
 rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh  |  7 ++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh b/rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh
index 6fab551..aa4b8fe 100755
--- a/rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh
+++ b/rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh
@@ -266,19 +266,23 @@ LogMessageDomains 1
 Log notice file $LOG_DIR/bridge.log
 #Log debug file $LOG_DIR/bridge.debug
 
+##### ExitPolicy
+ExitPolicy accept *:*
+ExitPolicy accept6 [::]:*
+
+##### Bridge Settings
 ServerTransportPlugin obfs4 exec /usr/bin/lyrebird
 ServerTransportListenAddr obfs4 0.0.0.0:${TOR_BRIDGE_PT_PORT:-57003}
+ExitRelay 0
+BridgeRelay 1
 
 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 GBytes}
-BridgeRelay 1
 PublishServerDescriptor 1
 ExtORPort auto
-Exitpolicy accept *:*
-Exitpolicy accept6 *:*
 AccountingStart month 1 00:00
 DirPortFrontPage /usr/share/tor/html/exit.html
 %include $CONF_DIR/conf.d/*.conf
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 a765d4c..ac5445e 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
@@ -266,13 +266,18 @@ LogMessageDomains 1
 Log notice file $LOG_DIR/relay.log
 #Log debug file $LOG_DIR/relay.debug
 
+##### ExitPolicy
+ExitPolicy accept *:*
+ExitPolicy accept6 [::]:*
+
+##### Relay Settings
 ServerTransportPlugin obfs4 exec /usr/bin/lyrebird
 ServerTransportListenAddr obfs4 0.0.0.0:${TOR_RELAY_PORT:-57000}
 ORPort ${TOR_RELAY_OR_PORT:-57001}
 DirPort ${TOR_RELAY_DIR_PORT:-57002}
 
-BridgeRelay 0
 ExitRelay 1
+BridgeRelay 0
 PublishServerDescriptor 1
 ContactInfo ${TOR_RELAY_ADMIN:-tor-admin@$HOSTNAME}
 Nickname ${TOR_RELAY_NICK_NAME:-$RANDOM_NICK}