mirror of
https://github.com/casjaysdevdocker/tor
synced 2025-01-18 00:34:29 -05:00
🗃️ Committing everything that changed 🗃️
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/03-tor-server.sh
This commit is contained in:
parent
c1eb1f1dfe
commit
1df1e96cc0
@ -240,8 +240,12 @@ __update_conf_files() {
|
|||||||
if [ "$TOR_BRIDGE_ENABLED" = "yes" ]; then
|
if [ "$TOR_BRIDGE_ENABLED" = "yes" ]; then
|
||||||
mkdir -p "$CONF_DIR/conf.d"
|
mkdir -p "$CONF_DIR/conf.d"
|
||||||
cat <<EOF >>"$CONF_DIR/bridge.conf"
|
cat <<EOF >>"$CONF_DIR/bridge.conf"
|
||||||
|
##### Bridge
|
||||||
RunAsDaemon 0
|
RunAsDaemon 0
|
||||||
HardwareAccel 1
|
HardwareAccel 1
|
||||||
|
AddressDisableIPv6 0
|
||||||
|
|
||||||
|
#### control settings
|
||||||
ControlSocketsGroupWritable 1
|
ControlSocketsGroupWritable 1
|
||||||
CookieAuthentication 1
|
CookieAuthentication 1
|
||||||
CookieAuthFileGroupReadable 1
|
CookieAuthFileGroupReadable 1
|
||||||
@ -253,16 +257,15 @@ ControlSocket $RUN_DIR/bridge.sock
|
|||||||
CookieAuthFile $RUN_DIR/bridge.authcookie
|
CookieAuthFile $RUN_DIR/bridge.authcookie
|
||||||
|
|
||||||
##### socks option
|
##### socks option
|
||||||
|
SOCKSPort 0
|
||||||
SafeSocks ${TOR_SOCKS_SAFE:-0}
|
SafeSocks ${TOR_SOCKS_SAFE:-0}
|
||||||
SocksTimeout ${TOR_SOCKS_TIMEOUT:-10}
|
SocksTimeout ${TOR_SOCKS_TIMEOUT:-10}
|
||||||
|
|
||||||
#### bridge
|
##### logging
|
||||||
LogMessageDomains 1
|
LogMessageDomains 1
|
||||||
Log notice file $LOG_DIR/bridge.log
|
Log notice file $LOG_DIR/bridge.log
|
||||||
#Log debug file $LOG_DIR/bridge.debug
|
#Log debug file $LOG_DIR/bridge.debug
|
||||||
|
|
||||||
SOCKSPort 0
|
|
||||||
|
|
||||||
ServerTransportPlugin obfs4 exec /usr/bin/lyrebird
|
ServerTransportPlugin obfs4 exec /usr/bin/lyrebird
|
||||||
ServerTransportListenAddr obfs4 0.0.0.0:${TOR_BRIDGE_PT_PORT:-57003}
|
ServerTransportListenAddr obfs4 0.0.0.0:${TOR_BRIDGE_PT_PORT:-57003}
|
||||||
|
|
||||||
|
@ -240,8 +240,12 @@ __update_conf_files() {
|
|||||||
if [ "$TOR_RELAY_ENABLED" = "yes" ]; then
|
if [ "$TOR_RELAY_ENABLED" = "yes" ]; then
|
||||||
mkdir -p "$CONF_DIR/conf.d"
|
mkdir -p "$CONF_DIR/conf.d"
|
||||||
cat <<EOF >"$CONF_DIR/relay.conf"
|
cat <<EOF >"$CONF_DIR/relay.conf"
|
||||||
|
##### Relay
|
||||||
RunAsDaemon 0
|
RunAsDaemon 0
|
||||||
HardwareAccel 1
|
HardwareAccel 1
|
||||||
|
AddressDisableIPv6 0
|
||||||
|
|
||||||
|
#### control settings
|
||||||
ControlSocketsGroupWritable 1
|
ControlSocketsGroupWritable 1
|
||||||
CookieAuthentication 1
|
CookieAuthentication 1
|
||||||
CookieAuthFileGroupReadable 1
|
CookieAuthFileGroupReadable 1
|
||||||
@ -253,16 +257,15 @@ ControlSocket $RUN_DIR/relay.sock
|
|||||||
CookieAuthFile $RUN_DIR/relay.authcookie
|
CookieAuthFile $RUN_DIR/relay.authcookie
|
||||||
|
|
||||||
##### socks option
|
##### socks option
|
||||||
|
SOCKSPort 0
|
||||||
SafeSocks ${TOR_SOCKS_SAFE:-0}
|
SafeSocks ${TOR_SOCKS_SAFE:-0}
|
||||||
SocksTimeout ${TOR_SOCKS_TIMEOUT:-10}
|
SocksTimeout ${TOR_SOCKS_TIMEOUT:-10}
|
||||||
|
|
||||||
##### relay
|
##### logging
|
||||||
LogMessageDomains 1
|
LogMessageDomains 1
|
||||||
Log notice file $LOG_DIR/relay.log
|
Log notice file $LOG_DIR/relay.log
|
||||||
#Log debug file $LOG_DIR/relay.debug
|
#Log debug file $LOG_DIR/relay.debug
|
||||||
|
|
||||||
SOCKSPort 0
|
|
||||||
|
|
||||||
ServerTransportPlugin obfs4 exec /usr/bin/lyrebird
|
ServerTransportPlugin obfs4 exec /usr/bin/lyrebird
|
||||||
ServerTransportListenAddr obfs4 0.0.0.0:${TOR_RELAY_PORT:-57000}
|
ServerTransportListenAddr obfs4 0.0.0.0:${TOR_RELAY_PORT:-57000}
|
||||||
ORPort ${TOR_RELAY_OR_PORT:-57001}
|
ORPort ${TOR_RELAY_OR_PORT:-57001}
|
||||||
|
@ -241,7 +241,7 @@ __update_conf_files() {
|
|||||||
RunAsDaemon 0
|
RunAsDaemon 0
|
||||||
HardwareAccel 1
|
HardwareAccel 1
|
||||||
AddressDisableIPv6 0
|
AddressDisableIPv6 0
|
||||||
VirtualAddrNetwork 10.0.0.0/12
|
#VirtualAddrNetwork 10.0.0.0/12
|
||||||
|
|
||||||
#### control settings
|
#### control settings
|
||||||
ControlPort 127.0.0.1:9051
|
ControlPort 127.0.0.1:9051
|
||||||
@ -256,11 +256,11 @@ ControlSocket $RUN_DIR/server.sock
|
|||||||
CookieAuthFile $RUN_DIR/server.authcookie
|
CookieAuthFile $RUN_DIR/server.authcookie
|
||||||
|
|
||||||
##### socks option
|
##### socks option
|
||||||
|
SOCKSPort 0.0.0.0:9050
|
||||||
SafeSocks ${TOR_SOCKS_SAFE:-0}
|
SafeSocks ${TOR_SOCKS_SAFE:-0}
|
||||||
SocksTimeout ${TOR_SOCKS_TIMEOUT:-10}
|
SocksTimeout ${TOR_SOCKS_TIMEOUT:-10}
|
||||||
SOCKSPolicy accept *
|
SOCKSPolicy accept *
|
||||||
SOCKSPolicy accept6 *
|
SOCKSPolicy accept6 *
|
||||||
SOCKSPort 0.0.0.0:9050
|
|
||||||
|
|
||||||
##### logging
|
##### logging
|
||||||
LogMessageDomains 1
|
LogMessageDomains 1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user