From 87f45f3dba40cea22c5b01786546ea546e2fc846 Mon Sep 17 00:00:00 2001 From: casjay Date: Mon, 3 Feb 2025 15:19:26 -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/01-tor.sh rootfs/usr/local/etc/docker/init.d/02-named.sh rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh rootfs/usr/local/etc/docker/init.d/99-nginx.sh rootfs/usr/local/share/template-files/config/env/default.sample --- .env.scripts | 2 +- Dockerfile | 2 +- rootfs/usr/local/etc/docker/init.d/01-tor.sh | 2 +- rootfs/usr/local/etc/docker/init.d/02-named.sh | 2 +- rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh | 2 +- rootfs/usr/local/etc/docker/init.d/99-nginx.sh | 2 +- rootfs/usr/local/share/template-files/config/env/default.sample | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env.scripts b/.env.scripts index 208aeee..0954ba9 100644 --- a/.env.scripts +++ b/.env.scripts @@ -48,7 +48,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 3fe31c5..6b839fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG PHP_SERVER="bind" ARG BUILD_DATE="202408270947" 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.sh b/rootfs/usr/local/etc/docker/init.d/01-tor.sh index 38bfdeb..ddbd905 100755 --- a/rootfs/usr/local/etc/docker/init.d/01-tor.sh +++ b/rootfs/usr/local/etc/docker/init.d/01-tor.sh @@ -76,7 +76,7 @@ DATABASE_SUBDIR="tor" DATABASE_DIR="$DATABASE_BASE_DIR/$DATABASE_SUBDIR" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/tor" # set data directory diff --git a/rootfs/usr/local/etc/docker/init.d/02-named.sh b/rootfs/usr/local/etc/docker/init.d/02-named.sh index 25ed366..a9136c4 100755 --- a/rootfs/usr/local/etc/docker/init.d/02-named.sh +++ b/rootfs/usr/local/etc/docker/init.d/02-named.sh @@ -80,7 +80,7 @@ DATABASE_SUBDIR="named" DATABASE_DIR="$DATABASE_BASE_DIR/$DATABASE_SUBDIR" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/bind" # set data directory diff --git a/rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh b/rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh index db197e4..8353618 100755 --- a/rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh +++ b/rootfs/usr/local/etc/docker/init.d/03-php-fpm.sh @@ -76,7 +76,7 @@ DATABASE_SUBDIR="php-fpm" DATABASE_DIR="$DATABASE_BASE_DIR/$DATABASE_SUBDIR" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/php" # set data directory diff --git a/rootfs/usr/local/etc/docker/init.d/99-nginx.sh b/rootfs/usr/local/etc/docker/init.d/99-nginx.sh index a46e02f..6a990d1 100755 --- a/rootfs/usr/local/etc/docker/init.d/99-nginx.sh +++ b/rootfs/usr/local/etc/docker/init.d/99-nginx.sh @@ -76,7 +76,7 @@ DATABASE_SUBDIR="nginx" DATABASE_DIR="$DATABASE_BASE_DIR/$DATABASE_SUBDIR" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set webroot -WWW_ROOT_DIR="/usr/share/httpd/default" +WWW_ROOT_DIR="/usr/local/share/httpd/default" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Default predefined variables DATA_DIR="/data/nginx" # 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 04b6936..8077523 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}"