♻️ Migrate caddy to /config/ source-of-truth architecture ♻️

Remove template-files dead weight; bake configs into rootfs/tmp/etc/ and htdocs into rootfs/tmp/usr/local/share/caddy/htdocs/ so the image carries no runtime-copy layer. On first container start, __init_service_conf seeds /config/{svc}/ from the baked /etc/{svc}/; __update_conf_files then symlinks /etc/{svc} -> /config/{svc}/ so /etc always reflects user config. Flat /etc/ symlinks (php.ini, php-fpm.conf, php-fpm.d) added so all standard lookup paths resolve through /config/php/. - rootfs/root/docker/setup/03-files.sh: remove template-files copy blocks; remove /tmp/data handler; add /tmp/usr -> /usr handler; bump version - rootfs/usr/local/etc/docker/functions/entrypoint.sh: update to template version with __init_service_conf, command -v fast-exit guards on all __find_* functions - rootfs/usr/local/etc/docker/init.d/zz-caddy.sh: __update_conf_files uses __init_service_conf + symlink /etc/caddy -> /config/caddy; seed www_dir from /usr/local/share/caddy/htdocs on first start - rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh: __update_conf_files uses __init_service_conf + symlink /etc/php -> /config/php; add flat /etc/ symlinks for php.ini, php-fpm.conf, php-fpm.d - rootfs/tmp/etc/caddy/Caddyfile: baked caddy config (moved from template-files) - rootfs/tmp/etc/php/php.ini: baked PHP ini (moved from template-files) - rootfs/tmp/etc/php/php-fpm.conf: baked PHP-FPM config (moved from template-files) - rootfs/tmp/etc/php/php-fpm.d/www.conf: baked FPM pool config (moved from template-files) - rootfs/tmp/usr/local/share/caddy/htdocs/www/: baked web root (moved from template-files/data) - rootfs/usr/local/share/template-files/: deleted entirely rootfs/root/docker/setup/03-files.sh rootfs/tmp/ rootfs/usr/local/etc/docker/functions/entrypoint.sh rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh rootfs/usr/local/etc/docker/init.d/zz-caddy.sh rootfs/usr/local/share/template-files/config/caddy/Caddyfile rootfs/usr/local/share/template-files/config/env/default.sample rootfs/usr/local/share/template-files/config/env/examples/00-directory.sh rootfs/usr/local/share/template-files/config/env/examples/addresses.sh rootfs/usr/local/share/template-files/config/env/examples/certbot.sh rootfs/usr/local/share/template-files/config/env/examples/couchdb.sh rootfs/usr/local/share/template-files/config/env/examples/dockerd.sh rootfs/usr/local/share/template-files/config/env/examples/global.sh rootfs/usr/local/share/template-files/config/env/examples/healthcheck.sh rootfs/usr/local/share/template-files/config/env/examples/mariadb.sh rootfs/usr/local/share/template-files/config/env/examples/mongodb.sh rootfs/usr/local/share/template-files/config/env/examples/networking.sh rootfs/usr/local/share/template-files/config/env/examples/other.sh rootfs/usr/local/share/template-files/config/env/examples/php.sh rootfs/usr/local/share/template-files/config/env/examples/postgres.sh rootfs/usr/local/share/template-files/config/env/examples/redis.sh rootfs/usr/local/share/template-files/config/env/examples/services.sh rootfs/usr/local/share/template-files/config/env/examples/ssl.sh rootfs/usr/local/share/template-files/config/env/examples/supabase.sh rootfs/usr/local/share/template-files/config/env/examples/webservers.sh rootfs/usr/local/share/template-files/config/env/examples/zz-entrypoint.sh rootfs/usr/local/share/template-files/config/.gitkeep rootfs/usr/local/share/template-files/config/php/php-fpm.conf rootfs/usr/local/share/template-files/config/php/php-fpm.d/www.conf rootfs/usr/local/share/template-files/config/php/php.ini rootfs/usr/local/share/template-files/data/.gitkeep rootfs/usr/local/share/template-files/data/htdocs/www/404.html rootfs/usr/local/share/template-files/data/htdocs/www/css/bootstrap.css rootfs/usr/local/share/template-files/data/htdocs/www/css/cookieconsent.css rootfs/usr/local/share/template-files/data/htdocs/www/css/errorpages.css rootfs/usr/local/share/template-files/data/htdocs/www/css/index.css rootfs/usr/local/share/template-files/data/htdocs/www/favicon.ico rootfs/usr/local/share/template-files/data/htdocs/www/health/index.json rootfs/usr/local/share/template-files/data/htdocs/www/health/index.txt rootfs/usr/local/share/template-files/data/htdocs/www/images/403.png rootfs/usr/local/share/template-files/data/htdocs/www/images/404.gif rootfs/usr/local/share/template-files/data/htdocs/www/images/bg.png rootfs/usr/local/share/template-files/data/htdocs/www/images/favicon.ico rootfs/usr/local/share/template-files/data/htdocs/www/images/icon.png rootfs/usr/local/share/template-files/data/htdocs/www/images/icon.svg rootfs/usr/local/share/template-files/data/htdocs/www/index.php rootfs/usr/local/share/template-files/data/htdocs/www/info.php rootfs/usr/local/share/template-files/data/htdocs/www/js/app.js rootfs/usr/local/share/template-files/data/htdocs/www/js/bootstrap.min.js rootfs/usr/local/share/template-files/data/htdocs/www/js/errorpages/homepage.js rootfs/usr/local/share/template-files/data/htdocs/www/js/errorpages/isup.js rootfs/usr/local/share/template-files/data/htdocs/www/js/errorpages/loaddomain.js rootfs/usr/local/share/template-files/data/htdocs/www/js/errorpages/scale.fix.js rootfs/usr/local/share/template-files/data/htdocs/www/js/jquery/default.js rootfs/usr/local/share/template-files/data/htdocs/www/js/passprotect.min.js rootfs/usr/local/share/template-files/data/htdocs/www/site.webmanifest rootfs/usr/local/share/template-files/defaults/.gitkeep
2026-10-14 20:13:19 -04:00 · 2026-06-04 12:54:41 -04:00
1 parent 1f155c3c85
commit a31c2542bd
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202408270903-git
+##@Version           :  202606041215-git
 # @@Author           :  CasjaysDev
 # @@Contact          :  CasjaysDev <docker-admin@casjaysdev.pro>
 # @@License          :  MIT
@@ -57,28 +57,25 @@ if [ -d "/tmp/etc" ]; then
    if [ -d "$config" ]; then
      mkdir -p "/etc/$name"
      copy "$config/." "/etc/$name/"
-      mkdir -p "/usr/local/share/template-files/config/$name"
-      copy "$config/." "/usr/local/share/template-files/config/$name/"
    else
      copy "$config" "/etc/$name"
-      copy "$config" "/usr/local/share/template-files/config/$name"
    fi
  done
 fi
 unset config
-if [ -d "/tmp/data" ]; then
-  for data in "/tmp/data"/*; do
-    name="$(basename -- "$data")"
-    echo "Installing $data to /usr/local/share/template-files/data"
-    if [ -d "$data" ]; then
-      mkdir -p "/usr/local/share/template-files/data/$name"
-      copy "$data/." "/usr/local/share/template-files/data/$name/"
+if [ -d "/tmp/usr" ]; then
+  for usrpath in "/tmp/usr"/*; do
+    name="$(basename -- "$usrpath")"
+    echo "Installing $usrpath to /usr/$name"
+    if [ -d "$usrpath" ]; then
+      mkdir -p "/usr/$name"
+      copy "$usrpath/." "/usr/$name/"
    else
-      copy "$data" "/usr/local/share/template-files/data/$name"
+      copy "$usrpath" "/usr/$name"
    fi
  done
 fi
-unset data
+unset usrpath
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main script

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202605241142-git
+##@Version           :  202606041215-git
 # @@Author           :  Jason Hempstead
 # @@Contact          :  git-admin@casjaysdev.pro
 # @@License          :  LICENSE.md
@@ -273,23 +273,54 @@ __service_banner() {
  printf '# - - - %s %-*s %s - - - #\n' "$icon" "$text_width" "$full_message" "$icon"
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__find_php_bin() { find -L '/usr'/*bin -maxdepth 4 -name 'php-fpm*' 2>/dev/null | head -n1; }
+__find_php_bin() {
+  command -v php-fpm &>/dev/null || command -v php &>/dev/null || return 0
+  find -L '/usr'/*bin -maxdepth 4 -name 'php-fpm*' 2>/dev/null | head -n1
+}
 __find_php_ini() {
+  command -v php &>/dev/null || return 0
  local f
  f=$(find -L '/etc' -maxdepth 4 -name 'php.ini' 2>/dev/null | head -n1)
  [ -n "$f" ] && printf '%s\n' "${f%/php.ini}"
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__find_nginx_conf() { find -L '/etc' -maxdepth 4 -name 'nginx.conf' 2>/dev/null | head -n1; }
-__find_caddy_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'caddy.conf' 2>/dev/null | head -n1; }
-__find_lighttpd_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'lighttpd.conf' 2>/dev/null | head -n1; }
-__find_cherokee_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'cherokee.conf' 2>/dev/null | head -n1; }
-__find_httpd_conf() { find -L '/etc' -maxdepth 4 -type f -iname 'httpd.conf' -o -iname 'apache2.conf' 2>/dev/null | head -n1; }
+__find_nginx_conf() {
+  command -v nginx &>/dev/null || return 0
+  find -L '/etc' -maxdepth 4 -name 'nginx.conf' 2>/dev/null | head -n1
+}
+__find_caddy_conf() {
+  command -v caddy &>/dev/null || return 0
+  find -L '/etc' -maxdepth 4 -type f -iname 'caddy.conf' 2>/dev/null | head -n1
+}
+__find_lighttpd_conf() {
+  command -v lighttpd &>/dev/null || return 0
+  find -L '/etc' -maxdepth 4 -type f -iname 'lighttpd.conf' 2>/dev/null | head -n1
+}
+__find_cherokee_conf() {
+  command -v cherokee &>/dev/null || command -v cherokee-admin &>/dev/null || return 0
+  find -L '/etc' -maxdepth 4 -type f -iname 'cherokee.conf' 2>/dev/null | head -n1
+}
+__find_httpd_conf() {
+  command -v httpd &>/dev/null || command -v apache2 &>/dev/null || return 0
+  find -L '/etc' -maxdepth 4 -type f \( -iname 'httpd.conf' -o -iname 'apache2.conf' \) 2>/dev/null | head -n1
+}
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__find_mysql_conf() { find -L '/etc' -maxdepth 4 -type f -name 'my.cnf' 2>/dev/null | head -n1; }
-__find_pgsql_conf() { find -L '/var/lib' '/etc' -maxdepth 8 -type f -name 'postgresql.conf' 2>/dev/null | head -n1; }
-__find_couchdb_conf() { return; }
-__find_mongodb_conf() { return; }
+__find_mysql_conf() {
+  command -v mysqld &>/dev/null || command -v mariadbd &>/dev/null || command -v mysql &>/dev/null || return 0
+  find -L '/etc' -maxdepth 4 -type f -name 'my.cnf' 2>/dev/null | head -n1
+}
+__find_pgsql_conf() {
+  command -v postgres &>/dev/null || command -v pg_ctl &>/dev/null || return 0
+  find -L '/var/lib' '/etc' -maxdepth 8 -type f -name 'postgresql.conf' 2>/dev/null | head -n1
+}
+__find_couchdb_conf() {
+  command -v couchdb &>/dev/null || return 0
+  find -L '/opt/couchdb/etc' '/etc/couchdb' -maxdepth 4 -type f \( -name 'local.ini' -o -name 'default.ini' \) 2>/dev/null | head -n1
+}
+__find_mongodb_conf() {
+  command -v mongod &>/dev/null || return 0
+  find -L '/etc/mongodb' '/etc' -maxdepth 4 -type f \( -name 'mongod.conf' -o -name 'mongodb.conf' \) 2>/dev/null | head -n1
+}
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __random_password() { tr -dc '0-9a-zA-Z' < /dev/urandom | head -c${1:-16} && echo ""; }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -356,92 +387,6 @@ __update_ssl_certs() {
  fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__certbot() {
-  [ -n "$(type -P 'certbot')" ] || return 1
-  local options="$1"
-  local statusCode=0
-  local domain_list=""
-  local certbot_key_opts=""
-  local ADD_CERTBOT_DOMAINS=""
-  local CERTBOT_DOMAINS="${CERTBOT_DOMAINS:-$HOSTNAME}"
-  local CERT_BOT_MAIL="${CERT_BOT_MAIL:-ssl-admin@$CERTBOT_DOMAINS}"
-  local certbot_key_opts=""
-  mkdir -p "/config/letsencrypt"
-  __symlink "/etc/letsencrypt" "/config/letsencrypt"
-  is_renewal="$(find /etc/letsencrypt/renewal -type f 2>/dev/null || false)"
-  [ -f "/config/env/ssl.sh" ] && . "/config/env/ssl.sh"
-  [ -f "/config/certbot/env.sh" ] && . "/config/certbot/env.sh"
-  if [ -n "$SSL_KEY" ]; then
-    mkdir -p "$(dirname "$SSL_KEY")" 2>/dev/null || true
-  else
-    echo "The variable SSL_KEY is not set" >&2
-    return 1
-  fi
-  if [ -n "$SSL_CERT" ]; then
-    mkdir -p "$(dirname "$SSL_CERT")" 2>/dev/null || true
-  else
-    echo "The variable SSL_CERT is not set" >&2
-    return 1
-  fi
-  domain_list="$CERTBOT_DOMAINS www.$CERTBOT_DOMAINS mail.$CERTBOT_DOMAINS"
-  domain_list="$(echo "$domain_list" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
-  if [ "$CERT_BOT_ENABLED" != "true" ]; then
-    export CERT_BOT_ENABLED=""
-    return 10
-  fi
-  if [ -z "$CERT_BOT_MAIL" ]; then
-    echo "The variable CERT_BOT_MAIL is not set" >&2
-    return 1
-  fi
-  if [ -z "$CERTBOT_DOMAINS" ]; then
-    echo "The variable CERTBOT_DOMAINS is not set" >&2
-    return 1
-  fi
-  for domain in $CERTBOT_DOMAINS; do
-    [ -n "$domain" ] && ADD_CERTBOT_DOMAINS+="-d $domain "
-  done
-  local expand_opt=""
-  if [ -n "$is_renewal" ]; then
-    options="renew"
-    ADD_CERTBOT_DOMAINS=""
-  else
-    options="certonly"
-    expand_opt="--expand"
-  fi
-  certbot_key_opts="$ADD_CERTBOT_DOMAINS"
-  if [ -f "/config/certbot/setup.sh" ]; then
-    \bash "/config/certbot/setup.sh"
-    statusCode=$?
-  elif [ -f "/etc/named/certbot.sh" ]; then
-    \bash "/etc/named/certbot.sh"
-    statusCode=$?
-  elif [ -f "/config/certbot/dns.conf" ]; then
-    if certbot $options -n --dry-run --agree-tos $expand_opt --dns-rfc2136 --dns-rfc2136-credentials /config/certbot/dns.conf $certbot_key_opts; then
-      certbot $options -n --agree-tos $expand_opt --dns-rfc2136 --dns-rfc2136-credentials /config/certbot/dns.conf $certbot_key_opts
-    fi
-    statusCode=$?
-  elif [ -f "/config/certbot/certbot.conf" ]; then
-    if certbot $options -n --dry-run --agree-tos $expand_opt --dns-rfc2136 --dns-rfc2136-credentials /config/certbot/certbot.conf $certbot_key_opts; then
-      certbot $options -n --agree-tos $expand_opt --dns-rfc2136 --dns-rfc2136-credentials /config/certbot/certbot.conf $certbot_key_opts
-    fi
-    statusCode=$?
-  elif [ -f "/config/named/certbot-update.conf" ]; then
-    if certbot $options -n --dry-run --agree-tos $expand_opt --dns-rfc2136 --dns-rfc2136-credentials /config/named/certbot-update.conf $certbot_key_opts; then
-      certbot $options -n --agree-tos $expand_opt --dns-rfc2136 --dns-rfc2136-credentials /config/named/certbot-update.conf $certbot_key_opts
-    fi
-    statusCode=$?
-  else
-    if [ -n "$ADD_CERTBOT_DOMAINS" ]; then
-      certbot $options --agree-tos -m $CERT_BOT_MAIL --webroot "${WWW_ROOT_DIR:-/usr/local/share/httpd/default}" $certbot_key_opts
-      statusCode=$?
-    else
-      statusCode=1
-    fi
-  fi
-  [ $statusCode -eq 0 ] && __update_ssl_certs
-  return $statusCode
-}
-# - - - - - - - - - - - - - - - - - - - - - - - - -
 __display_user_info() {
  if [ -n "$user_name" ] || [ -n "$user_pass" ] || [ -n "$root_user_name" ] || [ -n "$root_user_pass" ]; then
    __banner "User info"
@@ -483,29 +428,26 @@ __init_config_etc() {
 }
 __create_ssl_cert() {
  local SSL_DIR="${SSL_DIR:-/etc/ssl}"
-  if ! __certbot certonly; then
-    [ -f "/config/env/ssl.sh" ] && . "/config/env/ssl.sh"
-    if [ -z "$SSL_DIR" ]; then
-      echo "SSL_DIR is unset"
-      return 1
-    fi
-    [ -d "$SSL_DIR" ] || mkdir -p "$SSL_DIR"
-    if [ -n "$FORCE_SSL" ] || [ ! -f "$SSL_CERT" ] || [ ! -f "$SSL_KEY" ]; then
-      echo "Setting Country to $COUNTRY and Setting State/Province to $STATE and Setting City to $CITY"
-      echo "Setting OU to $UNIT and Setting ORG to $ORG and Setting server to $CN"
-      echo "All variables can be overwritten by creating a /config/.ssl.env and setting the variables there"
-      echo "Creating ssl key and certificate in $SSL_DIR and will be valid for $((VALID_FOR / 365)) year[s]"
-      #
-      openssl req \
-        -new \
-        -newkey rsa:$RSA \
-        -days $VALID_FOR \
-        -nodes \
-        -x509 \
-        -subj "/C=${COUNTRY// /\\ }/ST=${STATE// /\\ }/L=${CITY// /\\ }/O=${ORG// /\\ }/OU=${UNIT// /\\ }/CN=${CN// /\\ }" \
-        -keyout "$SSL_KEY" \
-        -out "$SSL_CERT"
-    fi
+  [ -f "/config/env/ssl.sh" ] && . "/config/env/ssl.sh"
+  if [ -z "$SSL_DIR" ]; then
+    echo "SSL_DIR is unset" >&2
+    return 1
+  fi
+  [ -d "$SSL_DIR" ] || mkdir -p "$SSL_DIR"
+  if [ -n "$FORCE_SSL" ] || [ ! -f "$SSL_CERT" ] || [ ! -f "$SSL_KEY" ]; then
+    echo "Setting Country to $COUNTRY and Setting State/Province to $STATE and Setting City to $CITY"
+    echo "Setting OU to $UNIT and Setting ORG to $ORG and Setting server to $CN"
+    echo "All variables can be overwritten by creating a /config/.ssl.env and setting the variables there"
+    echo "Creating ssl key and certificate in $SSL_DIR and will be valid for $((VALID_FOR / 365)) year[s]"
+    openssl req \
+      -new \
+      -newkey rsa:$RSA \
+      -days $VALID_FOR \
+      -nodes \
+      -x509 \
+      -subj "/C=${COUNTRY// /\\ }/ST=${STATE// /\\ }/L=${CITY// /\\ }/O=${ORG// /\\ }/OU=${UNIT// /\\ }/CN=${CN// /\\ }" \
+      -keyout "$SSL_KEY" \
+      -out "$SSL_CERT"
  fi
  if [ -f "$SSL_CERT" ] && [ -f "$SSL_KEY" ]; then
    __update_ssl_certs
@@ -515,71 +457,105 @@ __create_ssl_cert() {
  fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__init_apache() {
-  local etc_dir="" conf_dir="" conf_dir="" www_dir="" apache_bin=""
-  etc_dir="/etc/${1:-apache2}"
-  conf_dir="/config/${1:-apache2}"
-  www_dir="${WWW_ROOT_DIR:-/data/htdocs}"
-  apache_bin="$(type -P 'httpd' || type -P 'apache2')"
+__init_service_conf() {
+  # Seed /config/$svc/ from build-time baked /etc sources on first container start.
+  # Copy only — no symlinks. Symlinking /etc back to /config/ is the service's own
+  # responsibility, done inside __update_conf_files in each init.d/*.sh script so
+  # each service controls its exact paths and variable substitution order.
  #
+  # Usage: __init_service_conf <conf_dir> <primary_etc_dir> [extra_etc_path ...]
+  #
+  #   primary_etc_dir  directory  → contents copied into conf_dir/ when conf_dir is empty
+  #   extra_etc_path   directory  → copied into conf_dir/<name>/ when that subdir is empty
+  #   extra_etc_path   file       → copied to conf_dir/<filename> when absent
+  local conf_dir="$1"
+  local primary_etc="$2"
+  shift 2
+  local src name
+  mkdir -p "$conf_dir"
+  if [ -d "$primary_etc" ] && __is_dir_empty "$conf_dir"; then
+    __copy_templates "$primary_etc/." "$conf_dir/"
+  fi
+  for src in "$@"; do
+    [ -e "$src" ] || continue
+    name="${src##*/}"
+    if [ -d "$src" ] && __is_dir_empty "$conf_dir/$name"; then
+      mkdir -p "$conf_dir/$name"
+      __copy_templates "$src/." "$conf_dir/$name/"
+    elif [ -f "$src" ] && [ ! -f "$conf_dir/$name" ]; then
+      cp -f "$src" "$conf_dir/$name"
+    fi
+  done
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - -
+__init_apache() {
+  command -v httpd &>/dev/null || command -v apache2 &>/dev/null || return 0
+  local svc="${1:-apache2}"
+  __init_service_conf "/config/$svc" "/etc/$svc"
  return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __init_nginx() {
-  local etc_dir="/etc/${1:-nginx}"
-  local conf_dir="/config/${1:-nginx}"
-  local www_dir="${WWW_ROOT_DIR:-/data/htdocs}"
-  local nginx_bin="$(type -P 'nginx')"
+  command -v nginx &>/dev/null || return 0
+  local svc="${1:-nginx}"
+  __init_service_conf "/config/$svc" "/etc/$svc"
  return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __init_php() {
-  local etc_dir="/etc/${1:-php}"
-  local conf_dir="/config/${1:-php}"
-  local php_bin="${PHP_BIN_DIR:-$(__find_php_bin)}"
+  command -v php &>/dev/null || return 0
+  local php_etc="${PHP_INI_DIR:-$(__find_php_ini)}"
+  __init_service_conf "/config/php" "${php_etc:-/etc/php}" \
+    "/etc/php.ini" "/etc/php-fpm" "/etc/php-fpm.conf"
  return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __init_mysql() {
-  local db_dir="/data/db/mysql"
-  local etc_dir="${home:-/etc/${1:-mysql}}"
-  local db_user="${SERVICE_USER:-mysql}"
-  local conf_dir="/config/${1:-mysql}"
-  local user_name="${MARIADB_USER:-root}"
-  local user_pass="${MARIADB_PASSWORD:-$MARIADB_ROOT_PASSWORD}"
-  local user_db="${MARIADB_DATABASE}"
-  local root_pass="$MARIADB_ROOT_PASSWORD"
-  local mysqld_bin="$(type -P 'mysqld')"
+  command -v mysqld &>/dev/null || command -v mariadbd &>/dev/null || return 0
+  local svc="${1:-mysql}"
+  __init_service_conf "/config/$svc" "/etc/$svc" "/etc/my.ini" "/etc/my.cnf"
+  [ -d "${DATABASE_DIR:-/data/db/$svc}" ] || mkdir -p "${DATABASE_DIR:-/data/db/$svc}"
  return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __init_mongodb() {
-  local home="${MONGODB_CONFIG_FILE:-$(__find_mongodb_conf)}"
-  local user_name="${INITDB_ROOT_USERNAME:-root}"
-  local user_pass="${MONGO_INITDB_ROOT_PASSWORD:-$_ROOT_PASSWORD}"
-  return
+  command -v mongod &>/dev/null || return 0
+  __init_service_conf "/config/mongodb" "/etc/mongodb" "/etc/mongod.conf"
+  return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __init_postgres() {
-  local home="${PGSQL_CONFIG_FILE:-$(__find_pgsql_conf)}"
-  local user_name="${POSTGRES_USER:-root}"
-  local user_pass="${POSTGRES_PASSWORD:-$POSTGRES_ROOT_PASSWORD}"
-  return
+  command -v postgres &>/dev/null || command -v pg_ctl &>/dev/null || return 0
+  local pg_etc
+  pg_etc="${PGSQL_CONFIG_FILE:+${PGSQL_CONFIG_FILE%/*}}"
+  [ -n "$pg_etc" ] || pg_etc="$(__find_pgsql_conf)"
+  [ -n "$pg_etc" ] && pg_etc="${pg_etc%/*}"
+  [ -n "$pg_etc" ] && __init_service_conf "/config/postgres" "$pg_etc"
+  return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __init_couchdb() {
-  local home="${COUCHDB_CONFIG_FILE:-$(__find_couchdb_conf)}"
-  local user_name="${COUCHDB_USER:-root}"
-  local user_pass="${COUCHDB_PASSWORD:-$SET_RANDOM_PASS}"
-  return
+  command -v couchdb &>/dev/null || return 0
+  __init_service_conf "/config/couchdb" "/etc/couchdb"
+  return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Show available init functions
 __init_help() {
  echo '
-__certbot
-__update_ssl_certs
-__create_ssl_cert
+Config seeding (copy /etc → /config, no symlinks):
+  __init_service_conf <conf_dir> <primary_etc_dir> [extra_etc_path ...]
+  __init_apache   [svc]   seeds /config/apache2  from /etc/apache2
+  __init_nginx    [svc]   seeds /config/nginx     from /etc/nginx
+  __init_php              seeds /config/php       from /etc/php* + /etc/php.ini + /etc/php-fpm
+  __init_mysql    [svc]   seeds /config/mysql     from /etc/mysql + /etc/my.{ini,cnf}
+  __init_mongodb          seeds /config/mongodb   from /etc/mongodb + /etc/mongod.conf
+  __init_postgres         seeds /config/postgres  from pg data dir
+  __init_couchdb          seeds /config/couchdb   from /etc/couchdb
+
+SSL:
+  __update_ssl_certs
+  __create_ssl_cert
 '
  return
 }
@@ -1389,100 +1365,6 @@ __initialize_custom_bin_dir() {
  fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
-__initialize_default_templates() {
-  local errors=0
-  if [ -n "$DEFAULT_TEMPLATE_DIR" ]; then
-    if [ "$CONFIG_DIR_INITIALIZED" = "no" ] && [ -d "/config" ]; then
-      __log_info "Copying default config files $DEFAULT_TEMPLATE_DIR > /config"
-      if [ ! -d "$DEFAULT_TEMPLATE_DIR" ]; then
-        __log_warn "Template directory not found: $DEFAULT_TEMPLATE_DIR"
-        return 0
-      fi
-      for create_config_template in "$DEFAULT_TEMPLATE_DIR"/*; do
-        if [ -e "$create_config_template" ]; then
-          create_template_name="${create_config_template##*/}"
-          if [ -d "$create_config_template" ]; then
-            mkdir -p "/config/$create_template_name/" || errors=$((errors + 1))
-            if __is_dir_empty "/config/$create_template_name"; then
-              if ! cp -Rf "$create_config_template/." "/config/$create_template_name/" 2>/dev/null; then
-                __log_warn "Failed to copy template directory: $create_template_name"
-                errors=$((errors + 1))
-              fi
-            fi
-          elif [ -f "$create_config_template" ]; then
-            if [ ! -e "/config/$create_template_name" ]; then
-              if ! cp -Rf "$create_config_template" "/config/$create_template_name" 2>/dev/null; then
-                __log_warn "Failed to copy template file: $create_template_name"
-                errors=$((errors + 1))
-              fi
-            fi
-          fi
-        fi
-      done
-      unset create_config_template create_template_name
-      __log_debug "Template initialization completed with $errors errors"
-    fi
-  fi
-  return 0
-}
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-__initialize_config_dir() {
-  local errors=0
-  if [ -n "$DEFAULT_CONF_DIR" ]; then
-    if [ "$CONFIG_DIR_INITIALIZED" = "no" ] && [ -d "/config" ]; then
-      __log_info "Copying custom config files: $DEFAULT_CONF_DIR > /config"
-      if [ ! -d "$DEFAULT_CONF_DIR" ]; then
-        __log_warn "Config directory not found: $DEFAULT_CONF_DIR"
-        return 0
-      fi
-      for create_config_template in "$DEFAULT_CONF_DIR"/*; do
-        if [ -e "$create_config_template" ]; then
-          create_config_name="${create_config_template##*/}"
-          if [ -d "$create_config_template" ]; then
-            mkdir -p "/config/$create_config_name" || errors=$((errors + 1))
-            if __is_dir_empty "/config/$create_config_name"; then
-              if ! cp -Rf "$create_config_template/." "/config/$create_config_name/" 2>/dev/null; then
-                __log_warn "Failed to copy config directory: $create_config_name"
-                errors=$((errors + 1))
-              fi
-            fi
-          elif [ -f "$create_config_template" ]; then
-            if [ ! -e "/config/$create_config_name" ]; then
-              if ! cp -Rf "$create_config_template" "/config/$create_config_name" 2>/dev/null; then
-                __log_warn "Failed to copy config file: $create_config_name"
-                errors=$((errors + 1))
-              fi
-            fi
-          fi
-        fi
-      done
-      unset create_config_template create_config_name
-      __log_debug "Config initialization completed with $errors errors"
-    fi
-  fi
-  return 0
-}
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-__initialize_data_dir() {
-  [ "$DATA_DIR_INITIALIZED" = "no" ] || return 0
-  if [ -d "/data" ]; then
-    if [ -n "$DEFAULT_DATA_DIR" ]; then
-      __log_info "Copying data files $DEFAULT_DATA_DIR > /data"
-      for create_data_template in "$DEFAULT_DATA_DIR"/*; do
-        create_data_name="${create_data_template##*/}"
-        if [ -n "$create_data_template" ]; then
-          if [ -d "$create_data_template" ]; then
-            mkdir -p "/data/$create_data_name"
-            __is_dir_empty "/data/$create_data_name" && cp -Rf "$create_data_template/." "/data/$create_data_name/" 2>/dev/null
-          elif [ -e "$create_data_template" ]; then
-            [ -e "/data/$create_data_name" ] || cp -Rf "$create_data_template" "/data/$create_data_name" 2>/dev/null
-          fi
-        fi
-      done
-      unset create_data_template
-    fi
-  fi
-}
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __initialize_www_root() {
  local WWW_INIT=""
@@ -1496,7 +1378,7 @@ __initialize_www_root() {
    WWW_INIT="false"
  fi
  if [ "$WWW_INIT" = "true" ] && [ -d "$WWW_TEMPLATE" ]; then
-    cp -Rf "$DEFAULT_DATA_DIR/data/htdocs/." "$WWW_ROOT_DIR/" 2>/dev/null
+    cp -Rf "$WWW_TEMPLATE/." "$WWW_ROOT_DIR/" 2>/dev/null
  fi
  __initialize_web_health "$WWW_ROOT_DIR"
 }
@@ -1533,27 +1415,16 @@ __is_htdocs_mounted() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 __initialize_ssl_certs() {
-  [ "$SSL_ENABLED" = "yes" ] && __certbot
-  if [ -d "/config/letsencrypt" ]; then
-    mkdir -p "/etc/letsencrypt"
-    __file_copy "/config/letsencrypt" "/etc/letsencrypt/"
-  elif [ -d "/etc/letsencrypt" ] && [ ! -d "/config/letsencrypt" ]; then
-    mkdir -p "/config/letsencrypt"
-    __file_copy "/etc/letsencrypt" "/config/letsencrypt/"
-  else
-    [ -d "$SSL_DIR" ] || mkdir -p "$SSL_DIR"
-    if [ "$SSL_ENABLED" = "true" ] || [ "$SSL_ENABLED" = "yes" ]; then
-      if [ -f "$SSL_CERT" ] && [ -f "$SSL_KEY" ]; then
-        SSL_ENABLED="true"
-        if [ -n "$SSL_CA" ] && [ -f "$SSL_CA" ]; then
-          mkdir -p "$SSL_DIR/certs"
-          cat "$SSL_CA" >>"/etc/ssl/certs/ca-certificates.crt"
-          cp -Rf "/." "$SSL_DIR/"
-        fi
-      else
-        [ -d "$SSL_DIR" ] || mkdir -p "$SSL_DIR"
-        __create_ssl_cert
+  [ -d "$SSL_DIR" ] || mkdir -p "$SSL_DIR"
+  if [ "$SSL_ENABLED" = "yes" ]; then
+    if [ -f "$SSL_CERT" ] && [ -f "$SSL_KEY" ]; then
+      if [ -n "$SSL_CA" ] && [ -f "$SSL_CA" ]; then
+        mkdir -p "$SSL_DIR/certs"
+        cat "$SSL_CA" >>"/etc/ssl/certs/ca-certificates.crt"
      fi
+      __update_ssl_certs
+    else
+      __create_ssl_cert
    fi
  fi
  type update-ca-certificates &>/dev/null && update-ca-certificates &>/dev/null
@@ -1687,9 +1558,6 @@ export SSL_CA="${SSL_CA:-/config/ssl/ca.crt}"
 export SSL_KEY="${SSL_KEY:-/config/ssl/localhost.pem}"
 export SSL_CERT="${SSL_CERT:-/config/ssl/localhost.crt}"
 export LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}"
-export DEFAULT_DATA_DIR="${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}"
-export DEFAULT_CONF_DIR="${DEFAULT_CONF_DIR:-/usr/local/share/template-files/config}"
-export DEFAULT_TEMPLATE_DIR="${DEFAULT_TEMPLATE_DIR:-/usr/local/share/template-files/defaults}"
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # Backup settings
 export BACKUP_MAX_DAYS="${BACKUP_MAX_DAYS:-}"
@@ -1743,6 +1611,6 @@ export ENTRYPOINT_DATA_INIT_FILE DATA_DIR_INITIALIZED ENTRYPOINT_CONFIG_INIT_FIL
 export ENTRYPOINT_PID_FILE ENTRYPOINT_INIT_FILE ENTRYPOINT_FIRST_RUN
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # export the functions
-export -f __get_pid __start_init_scripts __is_running __certbot __update_ssl_certs __create_ssl_cert
+export -f __get_pid __start_init_scripts __is_running __update_ssl_certs __create_ssl_cert
 # - - - - - - - - - - - - - - - - - - - - - - - - -
 # end of functions
@@ -56,23 +56,30 @@ __update_conf_files() {
  if [ -n "$php_bin" ]; then
    [ -d "/data/logs/php" ] || mkdir -p "/data/logs/php"
    chmod -Rf 777 "$data_dir/logs/php" /var/tmp
-    if [ "$etc_dir" != "/etc/php" ]; then
-      [ -d "/etc/php" ] && rm -Rf "/etc/php"
-      ln -sf "$etc_dir" "/etc/php"
+    # Seed /config/php from discovered php etc dir on first start (copy only)
+    __init_service_conf "$conf_dir" "$etc_dir"
+    # Symlink /etc/php -> /config/php so /etc always reflects user config
+    if [ ! -L "$etc_dir" ]; then
+      rm -rf "$etc_dir"
+      ln -sf "$conf_dir" "$etc_dir"
    fi
-    #
-    [ -d "$etc_dir" ] || mkdir -p "$etc_dir"
-    [ -d "$conf_dir/conf.d" ] && rm -R $etc_dir/conf.d/*
-    [ -d "$conf_dir" ] && cp -Rf "$conf_dir/." "$etc_dir/"
+    # Also normalize /etc/php if etc_dir differs (distros vary)
+    if [ "$etc_dir" != "/etc/php" ] && [ ! -L "/etc/php" ]; then
+      ln -sf "$conf_dir" "/etc/php"
+    fi
+    # Flat /etc/ symlinks so /etc/php.ini, /etc/php-fpm.conf, /etc/php-fpm.d always exist
+    [ -L "/etc/php.ini" ] || [ -e "/etc/php.ini" ] || ln -sf "/etc/php/php.ini" "/etc/php.ini"
+    [ -L "/etc/php-fpm.conf" ] || [ -e "/etc/php-fpm.conf" ] || ln -sf "/etc/php/php-fpm.conf" "/etc/php-fpm.conf"
+    [ -L "/etc/php-fpm.d" ] || [ -e "/etc/php-fpm.d" ] || ln -sf "/etc/php/php-fpm.d" "/etc/php-fpm.d"
    #
    if [ -f "$www_dir/www/index.html" ] && [ -f "$www_dir/www/index.php" ]; then
-      [ -f "$www_dir/www/index.html" ] && rm -Rf "$www_dir/www/index.html"
+      rm -Rf "$www_dir/www/index.html"
    fi
    chmod -Rf 777 "/data/logs/php"
    #
-    sed -i 's|user.*=.*|user = '$user'|g' "$etc_dir"/*/www.conf
-    sed -i 's|group.*=.*|group = '$user'|g' "$etc_dir"/*/www.conf
-    chown -Rf "$user" "$etc_dir" "$data_dir/logs/php" /var/tmp
+    sed -i 's|user.*=.*|user = '"$php_user"'|g' "$conf_dir"/*/www.conf
+    sed -i 's|group.*=.*|group = '"$php_user"'|g' "$conf_dir"/*/www.conf
+    chown -Rf "$php_user" "$conf_dir" "$data_dir/logs/php" /var/tmp
  else
    echo "php can not be found"
    [ -f "$www_dir/info.php" ] && echo "PHP support is not enabled" >"$www_dir/info.php"
@@ -52,13 +52,23 @@ caddy_bin="$(type -P 'caddy' || type -P 'Caddy')"
 # use this function to update config files - IE: change port
 __update_conf_files() {
  echo "Initializing caddy web server in $conf_dir"
-  [ -d "$etc_dir" ] || mkdir -p "$etc_dir" "$conf_dir"
-  [ -d "$conf_dir" ] && cp -Rf "$conf_dir/." "$etc_dir/" || cp -Rf "$etc_dir/." "$conf_dir/"
+  # Seed /config/caddy from /etc/caddy on first start (copy only)
+  __init_service_conf "$conf_dir" "$etc_dir"
+  # Symlink /etc/caddy -> /config/caddy so /etc always reflects user config
+  if [ ! -L "$etc_dir" ]; then
+    rm -rf "$etc_dir"
+    ln -sf "$conf_dir" "$etc_dir"
+  fi
  #
  [ -d "/data/logs/caddy" ] || mkdir -p "/data/logs/caddy"
  chmod -Rf 777 "/data/logs/caddy"
  #
+  # Seed web root from baked-in share on first start
+  local share_htdocs="/usr/local/share/caddy/htdocs"
  [ -d "$www_dir" ] || mkdir -p "$www_dir"
+  if [ -d "$share_htdocs" ] && __is_dir_empty "$www_dir"; then
+    cp -Rf "$share_htdocs/." "$www_dir/"
+  fi
  [ -d "$www_dir/www/health" ] || mkdir -p "$www_dir/www/health"
  [ -f "$www_dir/www/health/index.txt" ] || echo 'ok' >"$www_dir/www/health/index.txt"
  [ -f "$www_dir/www/health/index.json" ] || echo '{ "status": "ok" }' >"$www_dir/www/health/index.json"
@@ -1,135 +0,0 @@
-#!/usr/bin/env bash
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# Set bash options
-[ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -o pipefail -x$DEBUGGER_OPTIONS || set -o pipefail
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# import the functions file
-[ -f "/usr/local/etc/docker/functions/entrypoint.sh" ] && . "/usr/local/etc/docker/functions/entrypoint.sh"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# GLOBAL enviroment variables
-#USER="${USER:-root}"
-#LANG="${LANG:-C.UTF-8}"
-#TZ="${TZ:-America/New_York}"
-#SERVICE_USER="${SERVICE_USER:-root}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# directory settings
-#BACKUP_DIR="${BACKUP_DIR:-/data/backups}"
-#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}"
-#DEFAULT_CONF_DIR="${DEFAULT_CONF_DIR:-/usr/local/share/template-files/config}"
-#DEFAULT_TEMPLATE_DIR="${DEFAULT_TEMPLATE_DIR:-/usr/local/share/template-files/defaults}"
-#DBTYPE="sqlite"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# healthcheck
-#HEALTH_ENABLED="${HEALTH_ENABLED:-$ENV_HEALTH_ENABLED}"
-#HEALTH_URL="${HEALTH_URL:-}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# php settings
-#PHP_VERSION="${PHP_VERSION//php/}"
-#PHP_INI_DIR="${PHP_INI_DIR:-$(__find_php_ini)}"
-#PHP_BIN_DIR="${PHP_BIN_DIR:-$(__find_php_bin)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# services/ports
-#ENV_PORTS="${ENV_PORTS:-}"
-#SERVICE_PORT="${SERVICE_PORT:-$PORT}"
-#WEB_SERVER_PORTS="${WEB_SERVER_PORTS:-$ENV_WEB_SERVER_PORTS}"
-#SERVICES_LIST="${PROCS_LIST:-$SERVICES_LIST} "
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# networing info
-DOMAINNAME="${DOMAINNAME:-}"
-HOSTNAME="${HOSTNAME:-casjaysdev-GEN_SCRIPT_REPLACE_APPNAME}"
-FULL_DOMAIN_NAME="${FULL_DOMAIN_NAME:-${DOMAINNAME:-$HOSTNAME}}"
-SERVER_ADMIN="${SERVER_ADMIN:-root@${EMAIL_DOMAIN:-${DOMAINNAME:-$FULL_DOMAIN_NAME}}}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-EMAIL_RELAY="${EMAIL_RELAY:-}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# get ip addresses
-CONTAINER_IP4_ADDRESS="${CONTAINER_IP4_ADDRESS:-$(__get_ip4)}"
-CONTAINER_IP6_ADDRESS="${CONTAINER_IP6_ADDRESS:-$(__get_ip6)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# cerbot
-#CERT_BOT_MAIL="${CERT_BOT_MAIL:-}"
-#CERTBOT_DOMAINS="${CERTBOT_DOMAINS:-}"
-#CERT_BOT_ENABLED="${CERT_BOT_ENABLED:-false}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# ssl server settings
-#SSL_ENABLED="${SSL_ENABLED:-false}"
-#SSL_DIR="${SSL_DIR:-/config/ssl}"
-#SSL_CA="${SSL_CA:-$SSL_DIR/ca.crt}"
-#SSL_KEY="${SSL_KEY:-$SSL_DIR/server.key}"
-#SSL_CERT="${SSL_CERT:-$SSL_DIR/server.crt}"
-#SSL_CONTAINER_DIR="${SSL_CONTAINER_DIR:-/etc/ssl/CA}"
-#COUNTRY="${COUNTRY:-US}"
-#STATE="${STATE:-NY}"
-#CITY="${CITY:-Albany}"
-#UNIT="${UNIT:-CasjaysDev}"
-#ORG="${ORG:-"Casjays Developments"}"
-#DAYS_VALID="${DAYS_VALID:-3650}"
-#RSA="${RSA:-4096}"
-#CN="${CN:-$FULL_DOMAIN_NAME}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# web server configs
-HTTPD_CONFIG_FILE="${HTTPD_CONFIG_FILE:-$(__find_httpd_conf)}"
-NGINX_CONFIG_FILE="${NGINX_CONFIG_FILE:-$(__find_nginx_conf)}"
-LIGHTTPD_CONFIG_FILE="${LIGHTTPD_CONFIG_FILE:-$(__find_lighttpd_conf)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# redis env
-DATABASE_DIR_REDIS="${DATABASE_DIR_REDIS:-$DATABASE_BASE_DIR/redis}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# postgresql env
-DATABASE_DIR_PGSQL="${DATABASE_DIR_PGSQL:-$PGDATA}"
-PGDATA="${DATABASE_DIR_PGSQL:-$DATABASE_BASE_DIR/postgres}"
-POSTGRES_USER="${DATABASE_USER_ROOT:-$POSTGRES_USER}"
-POSTGRES_PASSWORD="${DATABASE_PASS_ROOT:-$POSTGRES_PASSWORD}"
-POSTGRES_CONFIG_FILE="${POSTGRES_CONFIG_FILE:-$(__find_pgsql_conf)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# mariadb env
-MARIADB_ROOT_HOST="${MARIADB_ROOT_HOST:-%}"
-MARIADB_AUTO_UPGRADE="${MARIADB_AUTO_UPGRADE:-yes}"
-MARIADB_DATABASE="${DATABASE_CREATE:-$MARIADB_DATABASE}"
-MARIADB_USER="${DATABASE_USER_NORMAL:-$MARIADB_USER}"
-MARIADB_PASSWORD="${DATABASE_PASS_NORMAL:-$MARIADB_PASSWORD}"
-DATABASE_DIR_MARIADB="${DATABASE_DIR_MARIADB:-$DATABASE_BASE_DIR/mysql}"
-MARIADB_ROOT_PASSWORD="${DATABASE_PASS_ROOT:-$MARIADB_ROOT_PASSWORD}"
-MARIADB_ALLOW_EMPTY_ROOT_PASSWORD="${MARIADB_ALLOW_EMPTY_ROOT_PASSWORD:-}"
-MARIADB_INITDB_SKIP_TZINFO="${MARIADB_INITDB_SKIP_TZINFO}:-"
-MARIADB_RANDOM_ROOT_PASSWORD="${MARIADB_RANDOM_ROOT_PASSWORD:-}"
-MARIADB_CONFIG_FILE="${MARIADB_CONFIG_FILE:-$(__find_mysql_conf)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# mongodb env
-INITDB_ROOT_USERNAME="${DATABASE_USER_ROOT:-$INITDB_ROOT_USERNAME}"
-DATABASE_DIR_MONGODB="${DATABASE_DIR_MONGODB:-$DATABASE_BASE_DIR/mongodb}"
-MONGO_INITDB_ROOT_PASSWORD="${DATABASE_PASS_ROOT:-$MONGO_INITDB_ROOT_PASSWORD}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# couchdb env
-NODENAME="${NODENAME:-}"
-COUCHDB_USER="${DATABASE_USER_ROOT:-$COUCHDB_USER}"
-COUCHDB_PASSWORD="${DATABASE_PASS_ROOT:-$COUCHDB_PASSWORD}"
-DATABASE_DIR_COUCHDB="${DATABASE_DIR_COUCHDB:-$DATABASE_BASE_DIR/couchdb}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# Supabase
-DATABASE_DIR_SUPABASE="${DATABASE_DIR_SUPABASE:-$DATABASE_BASE_DIR/supabase}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# docker env
-DOCKER_HOST="unix://var/run/docker.sock"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# File locations
-ENTRYPOINT_PID_FILE="${ENTRYPOINT_PID_FILE:-/run/.entrypoint.pid}"
-ENTRYPOINT_INIT_FILE="${ENTRYPOINT_INIT_FILE:-/config/.entrypoint.done}"
-ENTRYPOINT_DATA_INIT_FILE="${ENTRYPOINT_DATA_INIT_FILE:-/data/.docker_has_run}"
-ENTRYPOINT_CONFIG_INIT_FILE="${ENTRYPOINT_CONFIG_INIT_FILE:-/config/.docker_has_run}"
-# - - - - - - - - - - - - - - - - - - - - - - - - -
-# Startup variables
-INIT_DATE="${INIT_DATE:-$(date)}"
-START_SERVICES="${START_SERVICES:-yes}"
-ENTRYPOINT_MESSAGE="${ENTRYPOINT_MESSAGE:-yes}"
-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"
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,10 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# directory settings
-WWW_ROOT_DIR="${ENV_WWW_ROOT_DIR:-${WWW_ROOT_DIR}}"
-BACKUP_DIR="${ENV_BACKUP_DIR:-${BACKUP_DIR:-/data/backups}}"
-LOCAL_BIN_DIR="${ENV_LOCAL_BIN_DIR:-${LOCAL_BIN_DIR:-/usr/local/bin}}"
-DATABASE_BASE_DIR="${ENV_DATABASE_BASE_DIR:-${DATABASE_BASE_DIR:-/data/db}}"
-DEFAULT_DATA_DIR="${ENV_DEFAULT_DATA_DIR:-${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}}"
-DEFAULT_CONF_DIR="${ENV_DEFAULT_CONF_DIR:-${DEFAULT_CONF_DIR:-/usr/local/share/template-files/config}}"
-DEFAULT_TEMPLATE_DIR="${ENV_DEFAULT_TEMPLATE_DIR:-${EDEFAULT_TEMPLATE_DIR:-/usr/local/share/template-files/defaults}}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,5 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# get ip addresses
-CONTAINER_IP4_ADDRESS="${CONTAINER_IP4_ADDRESS:-$(__get_ip4)}"
-CONTAINER_IP6_ADDRESS="${CONTAINER_IP6_ADDRESS:-$(__get_ip6)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,6 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# cerbot
-CERT_BOT_MAIL="${ENV_CERT_BOT_MAIL:-$CERT_BOT_MAIL}"
-CERTBOT_DOMAINS="${ENV_CERTBOT_DOMAINS:-$CERTBOT_DOMAINS}"
-CERT_BOT_ENABLED="${ENV_CERT_BOT_ENABLED:-${CERT_BOT_ENABLED:-false}}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,7 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# couchdb env
-COUCHDB_NODENAME="${ENV_COUCHDB_NODENAME:-${COUCHDB_NODENAME:-$NODENAME}}"
-COUCHDB_USER="${ENV_COUCHDB_USER:-${COUCHDB_USER:-$DATABASE_USER_ROOT}}"
-COUCHDB_PASSWORD="${ENV_COUCHDB_PASSWORD:-${COUCHDB_PASSWORD:-$DATABASE_PASS_ROOT}}"
-DATABASE_DIR_COUCHDB="${ENV_DATABASE_DIR_COUCHDB:-${DATABASE_DIR_COUCHDB:-/data/db/couchdb}}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,4 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# docker env
-DOCKER_HOST="${DOCKER_HOST:-unix://var/run/docker.sock}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,13 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# GLOBAL enviroment variables
-USER="${USER:-root}"
-LANG="${LANG:-C.UTF-8}"
-TZ="${TZ:-America/New_York}"
-ENV_PORTS="${ENV_PORTS//\/*/}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# How to set permissions
-SERVICE_USER="${SERVICE_USER:-}"
-SERVICE_GROUP="${SERVICE_GROUP:-}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-SERVICE_UID="${SERVICE_UID:-}" # set the user id
-SERVICE_GID="${SERVICE_GID:-}" # set the group id
@@ -1,5 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# healthcheck
-HEALTH_ENABLED="${HEALTH_ENABLED:-}"
-HEALTH_URL="${HEALTH_URL:-}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,14 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# mariadb env
-MARIADB_ROOT_HOST="${MARIADB_ROOT_HOST:-%}"
-MARIADB_AUTO_UPGRADE="${MARIADB_AUTO_UPGRADE:-yes}"
-MARIADB_DATABASE="${MARIADB_DATABASE:-$DATABASE_CREATE}"
-MARIADB_USER="${MARIADB_USER:-$DATABASE_USER_NORMAL}"
-MARIADB_PASSWORD="${MARIADB_PASSWORD:-$DATABASE_PASS_NORMAL}"
-DATABASE_DIR_MARIADB="${DATABASE_DIR_MARIADB:-/data/db/mariadb}"
-MARIADB_ROOT_PASSWORD="${MARIADB_ROOT_PASSWORD:-$DATABASE_PASS_ROOT}"
-MARIADB_ALLOW_EMPTY_ROOT_PASSWORD="${MARIADB_ALLOW_EMPTY_ROOT_PASSWORD:-}"
-MARIADB_INITDB_SKIP_TZINFO="${MARIADB_INITDB_SKIP_TZINFO}:-"
-MARIADB_RANDOM_ROOT_PASSWORD="${MARIADB_RANDOM_ROOT_PASSWORD:-}"
-MARIADB_CONFIG_FILE="${MARIADB_CONFIG_FILE:-$(__find_mysql_conf)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,20 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# mongodb env
-DATABASE_DIR_MONGODB="${DATABASE_DIR_MONGODB:-/data/db/mongodb}"
-INITDB_ROOT_USERNAME="${DATABASE_USER_ROOT:-$INITDB_ROOT_USERNAME}"
-MONGO_INITDB_ROOT_PASSWORD="${DATABASE_PASS_ROOT:-$MONGO_INITDB_ROOT_PASSWORD}"
-ME_CONFIG_EDITORTHEME="${ME_CONFIG_EDITORTHEME:-dracula}"
-ME_CONFIG_MONGODB_URL="${ME_CONFIG_MONGODB_URL:-mongodb://127.0.0.1:27017}"
-ME_CONFIG_MONGODB_ENABLE_ADMIN="${ME_CONFIG_MONGODB_ENABLE_ADMIN:-true}"
-ME_CONFIG_BASICAUTH_USERNAME="${ME_CONFIG_BASICAUTH_USERNAME:-}"
-ME_CONFIG_BASICAUTH_PASSWORD="${ME_CONFIG_BASICAUTH_PASSWORD:-}"
-ME_CONFIG_BASICAUTH_USERNAME_FILE="${ME_CONFIG_BASICAUTH_USERNAME_FILE:-}"
-ME_CONFIG_BASICAUTH_PASSWORD_FILE="${ME_CONFIG_BASICAUTH_PASSWORD_FILE:-}"
-ME_CONFIG_MONGODB_ADMINUSERNAME_FILE="${ME_CONFIG_MONGODB_ADMINUSERNAME_FILE:-}"
-ME_CONFIG_MONGODB_ADMINPASSWORD_FILE="${ME_CONFIG_MONGODB_ADMINPASSWORD_FILE:-}"
-ME_CONFIG_MONGODB_AUTH_USERNAME_FILE="${ME_CONFIG_MONGODB_AUTH_USERNAME_FILE:-}"
-ME_CONFIG_MONGODB_AUTH_PASSWORD_FILE="${ME_CONFIG_MONGODB_AUTH_PASSWORD_FILE:-}"
-ME_CONFIG_MONGODB_CA_FILE="${ME_CONFIG_MONGODB_CA_FILE:-}"
-VCAP_APP_HOST="${VCAP_APP_HOST:-0.0.0.0}"
-VCAP_APP_PORT="${VCAP_APP_PORT:-19054}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,9 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# networing info
-DOMAINNAME="${DOMAINNAME:-}"
-EMAIL_RELAY="${EMAIL_RELAY:-}"
-HOSTNAME="${HOSTNAME:-casjaysdev-GEN_SCRIPT_REPLACE_APPNAME}"
-EMAIL_DOMAIN="${EMAIL_DOMAIN:-${DOMAINNAME:-$HOSTNAME}}"
-FULL_DOMAIN_NAME="${FULL_DOMAIN_NAME:-${DOMAINNAME:-$HOSTNAME}}"
-SERVER_ADMIN="${SERVER_ADMIN:-root@${EMAIL_DOMAIN:-$FULL_DOMAIN_NAME}}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,4 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# other
-
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,6 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# php settings
-PHP_VERSION="${PHP_VERSION//php/}"
-PHP_INI_DIR="${PHP_INI_DIR:-$(__find_php_ini)}"
-PHP_BIN_DIR="${PHP_BIN_DIR:-$(__find_php_bin)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,8 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# postgresql env
-PGDATA="${DATABASE_DIR_PGSQL:-$PGDATA}"
-DATABASE_DIR_PGSQL="${DATABASE_DIR_PGSQL:-/data/db/postgres}"
-POSTGRES_USER="${DATABASE_USER_ROOT:-$POSTGRES_USER}"
-POSTGRES_PASSWORD="${DATABASE_PASS_ROOT:-$POSTGRES_PASSWORD}"
-POSTGRES_CONFIG_FILE="${POSTGRES_CONFIG_FILE:-$(__find_pgsql_conf)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,4 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# redis env
-DATABASE_DIR_REDIS="${DATABASE_DIR_REDIS:-/data/db/redis}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,7 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# services/ports
-ENV_PORTS="${ENV_PORTS:-}"
-SERVICE_PORT="${SERVICE_PORT:-$PORT}"
-WEB_SERVER_PORTS="${WEB_SERVER_PORTS:-}"
-SERVICES_LIST="${PROCS_LIST:-$SERVICES_LIST} "
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,19 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# ssl server settings
-SSL_ENABLED="${SSL_ENABLED:-false}"
-SSL_DIR="${SSL_CONTAINER_DIR:-/config/ssl}"
-SSL_DIR="${SSL_DIR:-$SSL_DIR}"
-SSL_CA="${SSL_CA:-$SSL_DIR/ca.crt}"
-SSL_KEY="${SSL_KEY:-$SSL_DIR/server.key}"
-SSL_CERT="${SSL_CERT:-$SSL_DIR/server.crt}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# certificate settings
-RSA="${RSA:-4096}"
-STATE="${STATE:-NY}"
-CITY="${CITY:-Albany}"
-COUNTRY="${COUNTRY:-US}"
-UNIT="${UNIT:-CasjaysDev}"
-ORG="${ORG:-"Casjays Developments"}"
-DAYS_VALID="${DAYS_VALID:-3650}"
-CN="${CN:-${FULL_DOMAIN_NAME:-$HOSTNAME}}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,4 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Supabase
-DATABASE_DIR_SUPABASE="${DATABASE_DIR_SUPABASE:-/data/db/supabase}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,8 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# web server configs
-HTTPD_CONFIG_FILE="${HTTPD_CONFIG_FILE:-$(__find_httpd_conf)}"
-NGINX_CONFIG_FILE="${NGINX_CONFIG_FILE:-$(__find_nginx_conf)}"
-CADDY_CONFIG_FILE="${CHEROKEE_CONFIG_FILE:-$(__find_caddy_conf)}"
-LIGHTTPD_CONFIG_FILE="${LIGHTTPD_CONFIG_FILE:-$(__find_lighttpd_conf)}"
-CHEROKEE_CONFIG_FILE="${CHEROKEE_CONFIG_FILE:-$(__find_cherokee_conf)}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,21 +0,0 @@
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# File locations
-ENTRYPOINT_PID_FILE="${ENTRYPOINT_PID_FILE:-/run/.entrypoint.pid}"
-ENTRYPOINT_INIT_FILE="${ENTRYPOINT_INIT_FILE:-/config/.entrypoint.done}"
-ENTRYPOINT_DATA_INIT_FILE="${ENTRYPOINT_DATA_INIT_FILE:-/data/.docker_has_run}"
-ENTRYPOINT_CONFIG_INIT_FILE="${ENTRYPOINT_CONFIG_INIT_FILE:-/config/.docker_has_run}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Startup variables
-INIT_DATE="${INIT_DATE:-$(date)}"
-START_SERVICES="${START_SERVICES:-yes}"
-ENTRYPOINT_MESSAGE="${ENTRYPOINT_MESSAGE:-yes}"
-ENTRYPOINT_FIRST_RUN="${ENTRYPOINT_FIRST_RUN:-yes}"
-DATA_DIR_INITIALIZED="${DATA_DIR_INITIALIZED:-false}"
-CONFIG_DIR_INITIALIZED="${CONFIG_DIR_INITIALIZED:-false}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Check if this is a new container
-[ -f "$ENTRYPOINT_PID_FILE" ] && START_SERVICES="no"
-[ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ] && ENTRYPOINT_FIRST_RUN="no"
-[ -f "$ENTRYPOINT_DATA_INIT_FILE" ] && DATA_DIR_INITIALIZED="true"
-[ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ] && CONFIG_DIR_INITIALIZED="true"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -