mirror of
				https://github.com/casjaysdevdocker/tor
				synced 2025-11-03 13:02:25 -05:00 
			
		
		
		
	🗃️ Committing everything that changed 🗃️
rootfs/tmp/etc/tor/torrc rootfs/usr/local/etc/docker/init.d/01-tor-bridge.sh rootfs/usr/local/etc/docker/init.d/01-tor-hidden.sh rootfs/usr/local/etc/docker/init.d/01-tor-relay.sh rootfs/usr/local/etc/docker/init.d/01-tor-server.sh
This commit is contained in:
		@@ -26,5 +26,5 @@ AddressDisableIPv6 0
 | 
			
		||||
SafeSocks 0
 | 
			
		||||
SocksTimeout 10
 | 
			
		||||
 | 
			
		||||
##### dns forwarder
 | 
			
		||||
%include /config/tor/conf.d/dns.conf
 | 
			
		||||
##### include configurations
 | 
			
		||||
%include /config/tor/conf.d/*.conf
 | 
			
		||||
 
 | 
			
		||||
@@ -242,7 +242,7 @@ __update_conf_files() {
 | 
			
		||||
    cat <<EOF >"$CONF_DIR/bridge.conf"
 | 
			
		||||
#### bridge
 | 
			
		||||
LogMessageDomains 1
 | 
			
		||||
Log notice file /data/logs/tor/bridge.log
 | 
			
		||||
Log notice file /$LOG_DIR/bridge.log
 | 
			
		||||
 | 
			
		||||
ServerTransportPlugin obfs4 exec /usr/bin/lyrebird
 | 
			
		||||
ServerTransportListenAddr obfs4 0.0.0.0:${TOR_PT_PORT:-8445}
 | 
			
		||||
@@ -256,11 +256,14 @@ AccountingMax ${TOR_ACCOUNT_MAX:-1000} GBytes
 | 
			
		||||
AccountingStart month 1 00:00
 | 
			
		||||
DirPort ${TOR_DIR_PORT:-8080}
 | 
			
		||||
DirPortFrontPage /usr/share/tor/html/exit.html
 | 
			
		||||
%include $CONF_DIR/bridge/*.conf
 | 
			
		||||
 | 
			
		||||
EOF
 | 
			
		||||
  else
 | 
			
		||||
    exit 1
 | 
			
		||||
  fi
 | 
			
		||||
  [ -f "$CONF_DIR/bridge/default.conf" ] || touch "$CONF_DIR/bridge/default.conf"
 | 
			
		||||
 | 
			
		||||
  # allow custom functions
 | 
			
		||||
  if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi
 | 
			
		||||
  # exit function
 | 
			
		||||
 
 | 
			
		||||
@@ -239,19 +239,23 @@ __update_conf_files() {
 | 
			
		||||
  # define actions
 | 
			
		||||
  if [ "$TOR_HIDDEN_ENABLED" = "yes" ]; then
 | 
			
		||||
    mkdir -p "$CONF_DIR/hidden"
 | 
			
		||||
    mkdir -p "$DATA_DIR/hidden_service"
 | 
			
		||||
    chmod 700 "$DATA_DIR/hidden_service"
 | 
			
		||||
    cat <<EOF >"$CONF_DIR/hidden.conf"
 | 
			
		||||
#### Default hidden dir
 | 
			
		||||
LogMessageDomains 1
 | 
			
		||||
Log notice file /data/logs/tor/hidden.log
 | 
			
		||||
Log notice file $LOG_DIR/hidden.log
 | 
			
		||||
 | 
			
		||||
HiddenServiceDir /data/tor/hidden_service/default
 | 
			
		||||
HiddenServiceDir $DATA_DIR/hidden_service/default
 | 
			
		||||
HiddenServicePort 80 127.0.0.1:80
 | 
			
		||||
%include /config/tor/hidden/*.conf
 | 
			
		||||
%include $CONF_DIR/hidden/*.conf
 | 
			
		||||
 | 
			
		||||
EOF
 | 
			
		||||
  else
 | 
			
		||||
    exit 1
 | 
			
		||||
  fi
 | 
			
		||||
  [ -f "$CONF_DIR/hidden/default.conf" ] || touch "$CONF_DIR/hidden/default.conf"
 | 
			
		||||
 | 
			
		||||
  # allow custom functions
 | 
			
		||||
  if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi
 | 
			
		||||
  # exit function
 | 
			
		||||
 
 | 
			
		||||
@@ -242,16 +242,18 @@ __update_conf_files() {
 | 
			
		||||
    cat <<EOF >"$CONF_DIR/relay.conf"
 | 
			
		||||
##### relay
 | 
			
		||||
LogMessageDomains 1
 | 
			
		||||
Log notice file /data/logs/tor/relay.log
 | 
			
		||||
Log notice file $LOG_DIR/relay.log
 | 
			
		||||
 | 
			
		||||
BridgeRelay 1
 | 
			
		||||
PublishServerDescriptor 1
 | 
			
		||||
%include /config/tor/relay/*.conf
 | 
			
		||||
%include $CONF_DIR/relay/*.conf
 | 
			
		||||
 | 
			
		||||
EOF
 | 
			
		||||
  else
 | 
			
		||||
    exit 1
 | 
			
		||||
  fi
 | 
			
		||||
  [ -f "$CONF_DIR/relay/default.conf" ] || touch "$CONF_DIR/relay/default.conf"
 | 
			
		||||
 | 
			
		||||
  # allow custom functions
 | 
			
		||||
  if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi
 | 
			
		||||
  # exit function
 | 
			
		||||
 
 | 
			
		||||
@@ -241,8 +241,9 @@ __update_conf_files() {
 | 
			
		||||
  if [ "$TOR_DNS_ENABLED" = "yes" ]; then
 | 
			
		||||
    mkdir -p "$CONF_DIR/conf.d"
 | 
			
		||||
    cat <<EOF >"$CONF_DIR/conf.d/dns.conf"
 | 
			
		||||
#### dns forwarder
 | 
			
		||||
LogMessageDomains 1
 | 
			
		||||
Log notice file /data/logs/tor/dns.log
 | 
			
		||||
Log notice file $LOG_DIR/dns.log
 | 
			
		||||
 | 
			
		||||
DNSPort 9053
 | 
			
		||||
AutomapHostsOnResolve 1
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user