diff --git a/rootfs/tmp/etc/tor/server.conf b/rootfs/tmp/etc/tor/server.conf index 8882a02..8111f15 100644 --- a/rootfs/tmp/etc/tor/server.conf +++ b/rootfs/tmp/etc/tor/server.conf @@ -1,3 +1,6 @@ +##### default rc +%include /config/tor/torrc + ##### logging LogMessageDomains 1 Log notice file /data/logs/tor/server.log diff --git a/rootfs/tmp/etc/tor/torrc b/rootfs/tmp/etc/tor/torrc index 1609a0b..5322ec9 100644 --- a/rootfs/tmp/etc/tor/torrc +++ b/rootfs/tmp/etc/tor/torrc @@ -9,7 +9,3 @@ HashedControlPassword 16:C30604D1D90F341360A14D9A1048C1DF4A3CA2411444E52EE5B954C DataDirectory /data/tor ControlSocket /run/tor/control.sock CookieAuthFile /run/tor/control.authcookie - -##### logging -LogMessageDomains 1 -Log notice file /data/logs/tor/notice.log diff --git a/rootfs/usr/local/etc/docker/init.d/01-tor-relay.sh b/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh similarity index 99% rename from rootfs/usr/local/etc/docker/init.d/01-tor-relay.sh rename to rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh index fe5f719..6bf4bb5 100755 --- a/rootfs/usr/local/etc/docker/init.d/01-tor-relay.sh +++ b/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh @@ -239,10 +239,14 @@ __update_conf_files() { if [ "$TOR_RELAY_ENABLED" = "yes" ]; then mkdir -p "$CONF_DIR/relay.d" cat <"$CONF_DIR/relay.conf" +##### default rc +%include /config/tor/torrc + ##### relay LogMessageDomains 1 Log notice file $LOG_DIR/relay.log +SOCKSPort 9051 BridgeRelay 1 PublishServerDescriptor 1 %include $CONF_DIR/relay.d/*.conf diff --git a/rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh b/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh similarity index 99% rename from rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh rename to rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh index 36866f2..c38630a 100755 --- a/rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh +++ b/rootfs/usr/local/etc/docker/init.d/03-tor-bridge.sh @@ -239,10 +239,14 @@ __update_conf_files() { if [ "$TOR_BRIDGE_ENABLED" = "yes" ]; then mkdir -p "$CONF_DIR/bridge.d" cat <"$CONF_DIR/bridge.conf" +##### default rc +%include /config/tor/torrc + #### bridge LogMessageDomains 1 Log notice file /$LOG_DIR/bridge.log +SOCKSPort 9052 ServerTransportPlugin obfs4 exec /usr/bin/lyrebird ServerTransportListenAddr obfs4 0.0.0.0:${TOR_PT_PORT:-8445} diff --git a/rootfs/usr/local/etc/docker/init.d/01-tor-hidden.sh b/rootfs/usr/local/etc/docker/init.d/04-tor-hidden.sh similarity index 99% rename from rootfs/usr/local/etc/docker/init.d/01-tor-hidden.sh rename to rootfs/usr/local/etc/docker/init.d/04-tor-hidden.sh index 0bd8d5b..2dacfed 100755 --- a/rootfs/usr/local/etc/docker/init.d/01-tor-hidden.sh +++ b/rootfs/usr/local/etc/docker/init.d/04-tor-hidden.sh @@ -241,10 +241,14 @@ __update_conf_files() { mkdir -p "$DATA_DIR/hidden_service" chmod 700 "$DATA_DIR/hidden_service" cat <"$CONF_DIR/hidden.conf" +##### default rc +%include /config/tor/torrc + #### Default hidden dir LogMessageDomains 1 Log notice file $LOG_DIR/hidden.log +SOCKSPort 9053 HiddenServiceDir $DATA_DIR/hidden_service/default HiddenServicePort 80 127.0.0.1:80 %include $CONF_DIR/hidden.d/*.conf diff --git a/rootfs/usr/local/etc/docker/init.d/02-php.sh b/rootfs/usr/local/etc/docker/init.d/98-php.sh similarity index 100% rename from rootfs/usr/local/etc/docker/init.d/02-php.sh rename to rootfs/usr/local/etc/docker/init.d/98-php.sh diff --git a/rootfs/usr/local/etc/docker/init.d/03-privoxy.sh b/rootfs/usr/local/etc/docker/init.d/99-privoxy.sh similarity index 100% rename from rootfs/usr/local/etc/docker/init.d/03-privoxy.sh rename to rootfs/usr/local/etc/docker/init.d/99-privoxy.sh