mirror of
https://github.com/casjaysdevdocker/tor
synced 2025-01-18 12:34:38 -05:00
🗃️ Committing everything that changed 🗃️
rootfs/root/docker/setup/05-custom.sh 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:
parent
daf36c026f
commit
00bce5b3a1
@ -24,7 +24,10 @@ set -o pipefail
|
|||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Set env variables
|
# Set env variables
|
||||||
exitCode=0
|
exitCode=0
|
||||||
|
tor_bin="$(type -p tor)"
|
||||||
|
for s in server relay bridge hidden; do
|
||||||
|
cp -Rf tor tor-$s
|
||||||
|
done
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Predefined actions
|
# Predefined actions
|
||||||
[ -f "/etc/privoxy/trust.new" ] && mv -f /etc/privoxy/trust.new /etc/privoxy/trust
|
[ -f "/etc/privoxy/trust.new" ] && mv -f /etc/privoxy/trust.new /etc/privoxy/trust
|
||||||
|
@ -30,7 +30,7 @@ trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]
|
|||||||
export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
|
export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
SCRIPT_FILE="$0"
|
SCRIPT_FILE="$0"
|
||||||
SERVICE_NAME="tor"
|
SERVICE_NAME="tor-bridge"
|
||||||
SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
|
SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# exit if __start_init_scripts function hasn't been Initialized
|
# exit if __start_init_scripts function hasn't been Initialized
|
||||||
@ -100,7 +100,7 @@ SERVICE_UID="0" # set the user id
|
|||||||
SERVICE_GID="0" # set the group id
|
SERVICE_GID="0" # set the group id
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# execute command variables - keep single quotes variables will be expanded later
|
# execute command variables - keep single quotes variables will be expanded later
|
||||||
EXEC_CMD_BIN='tor' # command to execute
|
EXEC_CMD_BIN='tor-bridge' # command to execute
|
||||||
EXEC_CMD_ARGS='-f $CONF_DIR/bridge.conf' # command arguments
|
EXEC_CMD_ARGS='-f $CONF_DIR/bridge.conf' # command arguments
|
||||||
EXEC_PRE_SCRIPT='' # execute script before
|
EXEC_PRE_SCRIPT='' # execute script before
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
@ -30,7 +30,7 @@ trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]
|
|||||||
export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
|
export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
SCRIPT_FILE="$0"
|
SCRIPT_FILE="$0"
|
||||||
SERVICE_NAME="tor"
|
SERVICE_NAME="tor-hidden"
|
||||||
SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
|
SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# exit if __start_init_scripts function hasn't been Initialized
|
# exit if __start_init_scripts function hasn't been Initialized
|
||||||
@ -100,7 +100,7 @@ SERVICE_UID="0" # set the user id
|
|||||||
SERVICE_GID="0" # set the group id
|
SERVICE_GID="0" # set the group id
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# execute command variables - keep single quotes variables will be expanded later
|
# execute command variables - keep single quotes variables will be expanded later
|
||||||
EXEC_CMD_BIN='tor' # command to execute
|
EXEC_CMD_BIN='tor-hidden' # command to execute
|
||||||
EXEC_CMD_ARGS='-f $CONF_DIR/hidden.conf' # command arguments
|
EXEC_CMD_ARGS='-f $CONF_DIR/hidden.conf' # command arguments
|
||||||
EXEC_PRE_SCRIPT='' # execute script before
|
EXEC_PRE_SCRIPT='' # execute script before
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
@ -30,7 +30,7 @@ trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]
|
|||||||
export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
|
export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
SCRIPT_FILE="$0"
|
SCRIPT_FILE="$0"
|
||||||
SERVICE_NAME="tor"
|
SERVICE_NAME="tor-relay"
|
||||||
SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
|
SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# exit if __start_init_scripts function hasn't been Initialized
|
# exit if __start_init_scripts function hasn't been Initialized
|
||||||
@ -100,7 +100,7 @@ SERVICE_UID="0" # set the user id
|
|||||||
SERVICE_GID="0" # set the group id
|
SERVICE_GID="0" # set the group id
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# execute command variables - keep single quotes variables will be expanded later
|
# execute command variables - keep single quotes variables will be expanded later
|
||||||
EXEC_CMD_BIN='tor' # command to execute
|
EXEC_CMD_BIN='tor-relay' # command to execute
|
||||||
EXEC_CMD_ARGS='-f $CONF_DIR/relay.conf' # command arguments
|
EXEC_CMD_ARGS='-f $CONF_DIR/relay.conf' # command arguments
|
||||||
EXEC_PRE_SCRIPT='' # execute script before
|
EXEC_PRE_SCRIPT='' # execute script before
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
@ -30,7 +30,7 @@ trap 'retVal=$?;[ "$SERVICE_IS_RUNNING" != "yes" ] && [ -f "$SERVICE_PID_FILE" ]
|
|||||||
export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
|
export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
SCRIPT_FILE="$0"
|
SCRIPT_FILE="$0"
|
||||||
SERVICE_NAME="tor"
|
SERVICE_NAME="tor-server"
|
||||||
SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
|
SCRIPT_NAME="$(basename -- "$SCRIPT_FILE" 2>/dev/null)"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# exit if __start_init_scripts function hasn't been Initialized
|
# exit if __start_init_scripts function hasn't been Initialized
|
||||||
@ -100,7 +100,7 @@ SERVICE_UID="0" # set the user id
|
|||||||
SERVICE_GID="0" # set the group id
|
SERVICE_GID="0" # set the group id
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# execute command variables - keep single quotes variables will be expanded later
|
# execute command variables - keep single quotes variables will be expanded later
|
||||||
EXEC_CMD_BIN='tor' # command to execute
|
EXEC_CMD_BIN='tor-server' # command to execute
|
||||||
EXEC_CMD_ARGS='-f $CONF_DIR/torrc' # command arguments
|
EXEC_CMD_ARGS='-f $CONF_DIR/torrc' # command arguments
|
||||||
EXEC_PRE_SCRIPT='' # execute script before
|
EXEC_PRE_SCRIPT='' # execute script before
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
|
Loading…
x
Reference in New Issue
Block a user