mirror of
				https://github.com/casjaysdevdocker/tor
				synced 2025-11-04 07:02:27 -05:00 
			
		
		
		
	🗃️ Committing everything that changed 🗃️
rootfs/tmp/etc/tor/bridge.conf rootfs/tmp/etc/tor/hidden.conf rootfs/tmp/etc/tor/relay.conf rootfs/tmp/etc/tor/server.conf 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 rootfs/usr/local/etc/docker/init.d/03-privoxy.sh
This commit is contained in:
		@@ -237,7 +237,7 @@ __update_conf_files() {
 | 
			
		||||
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 | 
			
		||||
  # define actions
 | 
			
		||||
  if [ "$TOR_BRIDGE_ENABLED" = "yes" ]; then
 | 
			
		||||
    mkdir -p "$CONF_DIR/bridge"
 | 
			
		||||
    mkdir -p "$CONF_DIR/bridge.d"
 | 
			
		||||
    cat <<EOF >"$CONF_DIR/bridge.conf"
 | 
			
		||||
#### bridge
 | 
			
		||||
LogMessageDomains 1
 | 
			
		||||
@@ -255,13 +255,13 @@ 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
 | 
			
		||||
%include $CONF_DIR/bridge.d/*.conf
 | 
			
		||||
 | 
			
		||||
EOF
 | 
			
		||||
  else
 | 
			
		||||
    exit 1
 | 
			
		||||
  fi
 | 
			
		||||
  [ -f "$CONF_DIR/bridge/default.conf" ] || touch "$CONF_DIR/bridge/default.conf"
 | 
			
		||||
  [ -f "$CONF_DIR/bridge.d/default.conf" ] || touch "$CONF_DIR/bridge.d/default.conf"
 | 
			
		||||
 | 
			
		||||
  # allow custom functions
 | 
			
		||||
  if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi
 | 
			
		||||
 
 | 
			
		||||
@@ -237,7 +237,7 @@ __update_conf_files() {
 | 
			
		||||
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 | 
			
		||||
  # define actions
 | 
			
		||||
  if [ "$TOR_HIDDEN_ENABLED" = "yes" ]; then
 | 
			
		||||
    mkdir -p "$CONF_DIR/hidden"
 | 
			
		||||
    mkdir -p "$CONF_DIR/hidden.d"
 | 
			
		||||
    mkdir -p "$DATA_DIR/hidden_service"
 | 
			
		||||
    chmod 700 "$DATA_DIR/hidden_service"
 | 
			
		||||
    cat <<EOF >"$CONF_DIR/hidden.conf"
 | 
			
		||||
@@ -247,13 +247,13 @@ Log notice file $LOG_DIR/hidden.log
 | 
			
		||||
 | 
			
		||||
HiddenServiceDir $DATA_DIR/hidden_service/default
 | 
			
		||||
HiddenServicePort 80 127.0.0.1:80
 | 
			
		||||
%include $CONF_DIR/hidden/*.conf
 | 
			
		||||
%include $CONF_DIR/hidden.d/*.conf
 | 
			
		||||
 | 
			
		||||
EOF
 | 
			
		||||
  else
 | 
			
		||||
    exit 1
 | 
			
		||||
  fi
 | 
			
		||||
  [ -f "$CONF_DIR/hidden/default.conf" ] || touch "$CONF_DIR/hidden/default.conf"
 | 
			
		||||
  [ -f "$CONF_DIR/hidden.d/default.conf" ] || touch "$CONF_DIR/hidden.d/default.conf"
 | 
			
		||||
 | 
			
		||||
  # allow custom functions
 | 
			
		||||
  if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi
 | 
			
		||||
 
 | 
			
		||||
@@ -237,7 +237,7 @@ __update_conf_files() {
 | 
			
		||||
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 | 
			
		||||
  # define actions
 | 
			
		||||
  if [ "$TOR_RELAY_ENABLED" = "yes" ]; then
 | 
			
		||||
    mkdir -p "$CONF_DIR/relay"
 | 
			
		||||
    mkdir -p "$CONF_DIR/relay.d"
 | 
			
		||||
    cat <<EOF >"$CONF_DIR/relay.conf"
 | 
			
		||||
##### relay
 | 
			
		||||
LogMessageDomains 1
 | 
			
		||||
@@ -245,13 +245,13 @@ Log notice file $LOG_DIR/relay.log
 | 
			
		||||
 | 
			
		||||
BridgeRelay 1
 | 
			
		||||
PublishServerDescriptor 1
 | 
			
		||||
%include $CONF_DIR/relay/*.conf
 | 
			
		||||
%include $CONF_DIR/relay.d/*.conf
 | 
			
		||||
 | 
			
		||||
EOF
 | 
			
		||||
  else
 | 
			
		||||
    exit 1
 | 
			
		||||
  fi
 | 
			
		||||
  [ -f "$CONF_DIR/relay/default.conf" ] || touch "$CONF_DIR/relay/default.conf"
 | 
			
		||||
  [ -f "$CONF_DIR/relay.d/default.conf" ] || touch "$CONF_DIR/relay.d/default.conf"
 | 
			
		||||
 | 
			
		||||
  # allow custom functions
 | 
			
		||||
  if builtin type -t __update_conf_files_local | grep -q 'function'; then __update_conf_files_local; fi
 | 
			
		||||
 
 | 
			
		||||
@@ -100,9 +100,9 @@ SERVICE_UID="0" # set the user id
 | 
			
		||||
SERVICE_GID="0" # set the group id
 | 
			
		||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 | 
			
		||||
# execute command variables - keep single quotes variables will be expanded later
 | 
			
		||||
EXEC_CMD_BIN='tor-server'          # command to execute
 | 
			
		||||
EXEC_CMD_ARGS='-f $CONF_DIR/torrc' # command arguments
 | 
			
		||||
EXEC_PRE_SCRIPT=''                 # execute script before
 | 
			
		||||
EXEC_CMD_BIN='tor-server'                # command to execute
 | 
			
		||||
EXEC_CMD_ARGS='-f $CONF_DIR/server.conf' # command arguments
 | 
			
		||||
EXEC_PRE_SCRIPT=''                       # execute script before
 | 
			
		||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 | 
			
		||||
# Is this service a web server
 | 
			
		||||
IS_WEB_SERVER="no"
 | 
			
		||||
 
 | 
			
		||||
@@ -100,9 +100,9 @@ SERVICE_UID="0" # set the user id
 | 
			
		||||
SERVICE_GID="0" # set the group id
 | 
			
		||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 | 
			
		||||
# execute command variables - keep single quotes variables will be expanded later
 | 
			
		||||
EXEC_CMD_BIN='privoxy' # command to execute
 | 
			
		||||
EXEC_CMD_ARGS=''       # command arguments
 | 
			
		||||
EXEC_PRE_SCRIPT=''     # execute script before
 | 
			
		||||
EXEC_CMD_BIN='privoxy'           # command to execute
 | 
			
		||||
EXEC_CMD_ARGS='$CONF_DIR/config' # command arguments
 | 
			
		||||
EXEC_PRE_SCRIPT=''               # execute script before
 | 
			
		||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 | 
			
		||||
# Is this service a web server
 | 
			
		||||
IS_WEB_SERVER="no"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user