From e4fd26dcc8dc2aa3b2e060ecfd1ad4d1b75e9e75 Mon Sep 17 00:00:00 2001 From: casjay Date: Mon, 3 Feb 2025 15:20:09 -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/99-proftpd.sh rootfs/usr/local/share/template-files/config/env/default.sample --- .env.scripts | 2 +- Dockerfile | 2 +- rootfs/usr/local/etc/docker/init.d/99-proftpd.sh | 2 +- rootfs/usr/local/share/template-files/config/env/default.sample | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.scripts b/.env.scripts index 3473604..c24f43d 100644 --- a/.env.scripts +++ b/.env.scripts @@ -42,7 +42,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 68d5226..23ad2c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG PHP_SERVER="proftp" ARG BUILD_DATE="Wed Jun 26 10:11:48 AM EDT 2024" 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/99-proftpd.sh b/rootfs/usr/local/etc/docker/init.d/99-proftpd.sh index 6dde3c3..4e890d7 100755 --- a/rootfs/usr/local/etc/docker/init.d/99-proftpd.sh +++ b/rootfs/usr/local/etc/docker/init.d/99-proftpd.sh @@ -76,7 +76,7 @@ DATABASE_BASE_DIR="${DATABASE_BASE_DIR:-/data/db}" DATABASE_DIR="${DATABASE_DIR_PROFTPD:-/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/proftpd" # 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 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}"