diff --git a/.env.scripts b/.env.scripts index 62db637..589a96f 100644 --- a/.env.scripts +++ b/.env.scripts @@ -40,7 +40,7 @@ EXPOSE_PORTS="1-65535" PHP_VERSION="php81" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # 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 127a50b..df0213b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG PHP_SERVER="nodejs" ARG BUILD_DATE="Wed Aug 30 12:16:05 AM 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/Dockerfile.10 b/Dockerfile.10 index 340289f..a8b25b3 100644 --- a/Dockerfile.10 +++ b/Dockerfile.10 @@ -4,7 +4,7 @@ ARG PHP_SERVER="nodejs" ARG BUILD_DATE="Wed Aug 30 12:16:05 AM 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/Dockerfile.12 b/Dockerfile.12 index c67bb3b..8c42e1d 100644 --- a/Dockerfile.12 +++ b/Dockerfile.12 @@ -4,7 +4,7 @@ ARG PHP_SERVER="nodejs" ARG BUILD_DATE="Wed Aug 30 12:16:05 AM 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/Dockerfile.14 b/Dockerfile.14 index 5444b37..fa0910b 100644 --- a/Dockerfile.14 +++ b/Dockerfile.14 @@ -4,7 +4,7 @@ ARG PHP_SERVER="nodejs" ARG BUILD_DATE="Wed Aug 30 12:16:05 AM 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/Dockerfile.16 b/Dockerfile.16 index e61ce93..5426633 100644 --- a/Dockerfile.16 +++ b/Dockerfile.16 @@ -4,7 +4,7 @@ ARG PHP_SERVER="nodejs" ARG BUILD_DATE="Wed Aug 30 12:16:05 AM 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/Dockerfile.18 b/Dockerfile.18 index 4624d4a..87752c7 100644 --- a/Dockerfile.18 +++ b/Dockerfile.18 @@ -4,7 +4,7 @@ ARG PHP_SERVER="nodejs" ARG BUILD_DATE="Wed Aug 30 12:16:05 AM 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/Dockerfile.20 b/Dockerfile.20 index aac2e5f..c625adc 100644 --- a/Dockerfile.20 +++ b/Dockerfile.20 @@ -4,7 +4,7 @@ ARG PHP_SERVER="nodejs" ARG BUILD_DATE="Wed Aug 30 12:16:05 AM 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/share/template-files/config/env/default.sample b/rootfs/usr/local/share/template-files/config/env/default.sample index 65ff1df..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}"