From 108f20aa3df3eb565e129f2197d0cbdc251628e6 Mon Sep 17 00:00:00 2001 From: casjay Date: Mon, 3 Feb 2025 15:19:24 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile .env.scripts rootfs/usr/local/etc/docker/init.d/zz-default.sh rootfs/usr/local/share/template-files/config/env/default.sample --- .env.scripts | 2 +- Dockerfile | 2 +- rootfs/usr/local/etc/docker/init.d/zz-default.sh | 2 +- .../local/share/template-files/config/env/default.sample | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env.scripts b/.env.scripts index 5f82d3b..ad17f91 100644 --- a/.env.scripts +++ b/.env.scripts @@ -23,7 +23,7 @@ EXPOSE_PORTS="80" PHP_VERSION="" NODE_VERSION="" NODE_MANAGER="" -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 e74d0f6..91f5d25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG PHP_SERVER="apprise" ARG BUILD_DATE="Mon Aug 28 06:49:21 PM EDT 2023" 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/zz-default.sh b/rootfs/usr/local/etc/docker/init.d/zz-default.sh index 0a9f016..5ebd143 100755 --- a/rootfs/usr/local/etc/docker/init.d/zz-default.sh +++ b/rootfs/usr/local/etc/docker/init.d/zz-default.sh @@ -74,7 +74,7 @@ PRE_EXEC_MESSAGE="" DATABASE_DIR="${DATABASE_DIR_APPRISE:-/data/db/sqlite}" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/apprise" # set data directory diff --git a/rootfs/usr/local/share/template-files/config/env/default.sample b/rootfs/usr/local/share/template-files/config/env/default.sample index db1888e..c4271ed 100644 --- a/rootfs/usr/local/share/template-files/config/env/default.sample +++ b/rootfs/usr/local/share/template-files/config/env/default.sample @@ -14,7 +14,7 @@ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # directory settings #BACKUP_DIR="${BACKUP_DIR:-/data/backups}" -#WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}" +#WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/local/share/httpd/default}" #LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}" #DATABASE_BASE_DIR="${DATABASE_BASE_DIR:-/data/db}" #DEFAULT_DATA_DIR="${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}" @@ -128,7 +128,7 @@ ENTRYPOINT_FIRST_RUN="${ENTRYPOINT_FIRST_RUN:-yes}" DATA_DIR_INITIALIZED="${DATA_DIR_INITIALIZED:-false}" CONFIG_DIR_INITIALIZED="${CONFIG_DIR_INITIALIZED:-false}" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -if [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; - then START_SERVICES="no" ENTRYPOINT_MESSAGE="no" ENTRYPOINT_FIRST_RUN="no" +if [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; then + START_SERVICES="no" ENTRYPOINT_MESSAGE="no" ENTRYPOINT_FIRST_RUN="no" fi # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -