diff --git a/rootfs/tmp/etc/unbound/unbound.conf b/rootfs/tmp/etc/unbound/unbound.conf index b8ae88d..7d4e6e0 100644 --- a/rootfs/tmp/etc/unbound/unbound.conf +++ b/rootfs/tmp/etc/unbound/unbound.conf @@ -5,7 +5,7 @@ server: interface: 0.0.0.0 interface: ::0 interface-automatic: yes - interface-automatic-ports: "53 9053" + interface-automatic-ports: "53 8053" access-control: 0.0.0.0/0 allow access-control: ::/0 allow domain-insecure: "onion" @@ -17,6 +17,5 @@ forward-zone: name: "onion" forward-addr: 127.0.0.1@8053 forward-zone: - name: "." - forward-addr: 1.1.1.1 - + name: "." + forward-addr: 1.1.1.1 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 2bc604d..8cfa5af 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,15 +266,10 @@ LogMessageDomains 1 Log notice file $LOG_DIR/bridge.log #Log debug file $LOG_DIR/bridge.debug -##### ExitPolicy -#ExitPolicy accept *:* -#ExitPolicy accept6 [::]:* - ##### Bridge Settings +BridgeRelay 1 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} @@ -282,9 +277,7 @@ Nickname ${TOR_BRIDGE_NICK_NAME:-$RANDOM_NICK} ContactInfo ${TOR_BRIDGE_ADMIN:-tor-admin@$HOSTNAME} AccountingMax ${TOR_BRIDGE_ACCOUNT_MAX:-1000 GBytes} PublishServerDescriptor 1 -ExtORPort auto 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/02-tor-relay.sh b/rootfs/usr/local/etc/docker/init.d/02-tor-relay.sh index dc16fc3..c8901e2 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,10 +266,6 @@ 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} @@ -277,7 +273,6 @@ ORPort ${TOR_RELAY_OR_PORT:-57001} DirPort ${TOR_RELAY_DIR_PORT:-57002} ExitRelay 1 -BridgeRelay 0 PublishServerDescriptor 1 ContactInfo ${TOR_RELAY_ADMIN:-tor-admin@$HOSTNAME} Nickname ${TOR_RELAY_NICK_NAME:-$RANDOM_NICK} 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 e43233a..420d81d 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 @@ -259,8 +259,8 @@ CookieAuthFile $RUN_DIR/server.authcookie SOCKSPort 0.0.0.0:9050 SafeSocks ${TOR_SOCKS_SAFE:-0} SocksTimeout ${TOR_SOCKS_TIMEOUT:-10} -SOCKSPolicy accept * -SOCKSPolicy accept6 * +#SOCKSPolicy accept * +#SOCKSPolicy accept6 * ##### logging LogMessageDomains 1