diff --git a/.env.scripts b/.env.scripts index e1ae2a3..699b52e 100644 --- a/.env.scripts +++ b/.env.scripts @@ -50,7 +50,7 @@ NODE_VERSION="system" NODE_MANAGER="system" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default directories -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" DEFAULT_FILE_DIR="/usr/local/share/template-files" DEFAULT_DATA_DIR="/usr/local/share/template-files/data" DEFAULT_CONF_DIR="/usr/local/share/template-files/config" diff --git a/Dockerfile b/Dockerfile index a411675..081080d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG PHP_SERVER="tor" ARG BUILD_DATE="202501060852" ARG LANGUAGE="en_US.UTF-8" ARG TIMEZONE="America/New_York" -ARG WWW_ROOT_DIR="/usr/share/httpd/default" +ARG WWW_ROOT_DIR="/usr/local/share/httpd/default" ARG DEFAULT_FILE_DIR="/usr/local/share/template-files" ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data" ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config" 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 f6343e9..2bc604d 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 @@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME" RESET_ENV="yes" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/tor/bridge" # set data directory 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 b70ef79..dc16fc3 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 @@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME" RESET_ENV="yes" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/tor/relay" # set data directory 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 3e7b8bc..e43233a 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 @@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME" RESET_ENV="yes" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/tor/server" # set data directory diff --git a/rootfs/usr/local/etc/docker/init.d/09-unbound.sh b/rootfs/usr/local/etc/docker/init.d/09-unbound.sh index ee1dddd..484ca6d 100755 --- a/rootfs/usr/local/etc/docker/init.d/09-unbound.sh +++ b/rootfs/usr/local/etc/docker/init.d/09-unbound.sh @@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME" RESET_ENV="no" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/unbound" # set data directory @@ -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='unbound' # command to execute -EXEC_CMD_ARGS='-d -c $CONF_DIR/unbound.conf ' # command arguments -EXEC_PRE_SCRIPT='unbound-checkconfig -f $CONF_DIR/unbound.conf' # execute script before +EXEC_CMD_BIN='unbound' # command to execute +EXEC_CMD_ARGS='-d -c $CONF_DIR/unbound.conf ' # command arguments +EXEC_PRE_SCRIPT='unbound-checkconfig -f $CONF_DIR/unbound.conf' # execute script before # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Is this service a web server IS_WEB_SERVER="no" @@ -488,7 +488,7 @@ __file_exists_with_content "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.local.sh" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SERVICE_EXIT_CODE=0 # default exit code # application specific -EXEC_CMD_NAME="$(basename -- "$EXEC_CMD_BIN")" # set the binary name +EXEC_CMD_NAME="$(basename -- "$EXEC_CMD_BIN")" # set the binary name SERVICE_PID_FILE="/run/init.d/$EXEC_CMD_NAME.pid" # set the pid file location SERVICE_PID_NUMBER="$(__pgrep)" # check if running EXEC_CMD_BIN="$(type -P "$EXEC_CMD_BIN" || echo "$EXEC_CMD_BIN")" # set full path diff --git a/rootfs/usr/local/etc/docker/init.d/98-privoxy.sh b/rootfs/usr/local/etc/docker/init.d/98-privoxy.sh index dd6680b..c4f88d5 100755 --- a/rootfs/usr/local/etc/docker/init.d/98-privoxy.sh +++ b/rootfs/usr/local/etc/docker/init.d/98-privoxy.sh @@ -62,7 +62,7 @@ START_SCRIPT="/usr/local/etc/docker/exec/$SERVICE_NAME" RESET_ENV="yes" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/privoxy" # set data directory diff --git a/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh b/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh index c24bc40..9c60cd4 100755 --- a/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh +++ b/rootfs/usr/local/etc/docker/init.d/zz-nginx.sh @@ -177,7 +177,7 @@ __run_precopy() { # Define actions/commands if [ ! -d "$WWW_ROOT_DIR" ] || __is_dir_empty "$WWW_ROOT_DIR"; then mkdir -p "$WWW_ROOT_DIR" - cp -Rf "/usr/share/httpd/default"/* "$WWW_ROOT_DIR/" + cp -Rf "/usr/local/share/httpd/default"/* "$WWW_ROOT_DIR/" fi if [ -d "$WWW_ROOT_DIR/.git" ]; then rm -Rf "$WWW_ROOT_DIR/.git"