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 fbf5f4b..6fab551 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 @@ -240,8 +240,12 @@ __update_conf_files() { if [ "$TOR_BRIDGE_ENABLED" = "yes" ]; then mkdir -p "$CONF_DIR/conf.d" cat <>"$CONF_DIR/bridge.conf" +##### Bridge RunAsDaemon 0 HardwareAccel 1 +AddressDisableIPv6 0 + +#### control settings ControlSocketsGroupWritable 1 CookieAuthentication 1 CookieAuthFileGroupReadable 1 @@ -253,16 +257,15 @@ ControlSocket $RUN_DIR/bridge.sock CookieAuthFile $RUN_DIR/bridge.authcookie ##### socks option +SOCKSPort 0 SafeSocks ${TOR_SOCKS_SAFE:-0} SocksTimeout ${TOR_SOCKS_TIMEOUT:-10} -#### bridge +##### logging LogMessageDomains 1 Log notice file $LOG_DIR/bridge.log #Log debug file $LOG_DIR/bridge.debug -SOCKSPort 0 - ServerTransportPlugin obfs4 exec /usr/bin/lyrebird ServerTransportListenAddr obfs4 0.0.0.0:${TOR_BRIDGE_PT_PORT:-57003} 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 f13cc35..a765d4c 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 @@ -240,8 +240,12 @@ __update_conf_files() { if [ "$TOR_RELAY_ENABLED" = "yes" ]; then mkdir -p "$CONF_DIR/conf.d" cat <"$CONF_DIR/relay.conf" +##### Relay RunAsDaemon 0 HardwareAccel 1 +AddressDisableIPv6 0 + +#### control settings ControlSocketsGroupWritable 1 CookieAuthentication 1 CookieAuthFileGroupReadable 1 @@ -253,16 +257,15 @@ ControlSocket $RUN_DIR/relay.sock CookieAuthFile $RUN_DIR/relay.authcookie ##### socks option +SOCKSPort 0 SafeSocks ${TOR_SOCKS_SAFE:-0} SocksTimeout ${TOR_SOCKS_TIMEOUT:-10} -##### relay +##### logging LogMessageDomains 1 Log notice file $LOG_DIR/relay.log #Log debug file $LOG_DIR/relay.debug -SOCKSPort 0 - ServerTransportPlugin obfs4 exec /usr/bin/lyrebird ServerTransportListenAddr obfs4 0.0.0.0:${TOR_RELAY_PORT:-57000} ORPort ${TOR_RELAY_OR_PORT:-57001} diff --git a/rootfs/usr/local/etc/docker/init.d/03-tor-server.sh b/rootfs/usr/local/etc/docker/init.d/03-tor-server.sh index c6d323d..7e8f87e 100755 --- a/rootfs/usr/local/etc/docker/init.d/03-tor-server.sh +++ b/rootfs/usr/local/etc/docker/init.d/03-tor-server.sh @@ -241,7 +241,7 @@ __update_conf_files() { RunAsDaemon 0 HardwareAccel 1 AddressDisableIPv6 0 -VirtualAddrNetwork 10.0.0.0/12 +#VirtualAddrNetwork 10.0.0.0/12 #### control settings ControlPort 127.0.0.1:9051 @@ -256,11 +256,11 @@ ControlSocket $RUN_DIR/server.sock CookieAuthFile $RUN_DIR/server.authcookie ##### socks option +SOCKSPort 0.0.0.0:9050 SafeSocks ${TOR_SOCKS_SAFE:-0} SocksTimeout ${TOR_SOCKS_TIMEOUT:-10} SOCKSPolicy accept * SOCKSPolicy accept6 * -SOCKSPort 0.0.0.0:9050 ##### logging LogMessageDomains 1