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

Migrate ntfy Docker image to the new build-time config architecture. - rootfs/root/docker/setup/03-files.sh: rewrite to canonical form with /tmp/bin, /tmp/var, /tmp/etc, /tmp/usr handlers - rootfs/usr/local/etc/docker/functions/entrypoint.sh: update to latest template - rootfs/usr/local/etc/docker/init.d/*.sh: fix $(basename) UUOC; move inline comments above code lines - rootfs/tmp/etc/: add service config files (ntfy ) deployed to /etc/ at build time - rootfs/usr/local/share/template-files/: delete; config now deployed via /tmp/etc/ and /tmp/usr/ at build time rootfs/root/docker/setup/03-files.sh rootfs/tmp/ rootfs/usr/local/etc/docker/functions/entrypoint.sh rootfs/usr/local/etc/docker/init.d/ntfy.sh 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/ntfy/client.yml rootfs/usr/local/share/template-files/config/ntfy/.env.ntfy rootfs/usr/local/share/template-files/config/ntfy/server.yml rootfs/usr/local/share/template-files/data/.gitkeep rootfs/usr/local/share/template-files/defaults/.gitkeep
2026-06-24 08:01:06 -04:00 · 2026-06-04 14:39:13 -04:00
parent 550108c8c3
commit 6f9dd40e7e
29 changed files with 258 additions and 670 deletions
@@ -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
@@ -43,7 +43,7 @@ __script_exit() {
  fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-SCRIPT_NAME="$(basename "$0" 2>/dev/null)"
+SCRIPT_NAME="${0##*/}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 export PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -70,18 +70,27 @@ RESET_ENV="yes"
 PRE_EXEC_MESSAGE=""
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Default predefined variables
-WORKDIR=""                 # set working directory
-DATA_DIR="/data"           # set data directory
-WWW_DIR="/data/htdocs/www" # set the web root
+# set working directory
+WORKDIR=""
+# set data directory
+DATA_DIR="/data"
+# set the web root
+WWW_DIR="/data/htdocs/www"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ETC_DIR="/etc/ntfy"     # set etc directory
-CONF_DIR="/config/ntfy" # set config directory
+# set etc directory
+ETC_DIR="/etc/ntfy"
+# set config directory
+CONF_DIR="/config/ntfy"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-RUN_DIR="/run/init.d"     # set scripts pid dir
-LOG_DIR="/data/logs/ntfy" # set log directory
+# set scripts pid dir
+RUN_DIR="/run/init.d"
+# set log directory
+LOG_DIR="/data/logs/ntfy"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-ROOT_FILE_PREFIX="/config/secure/auth/root" # directory to save username/password for root user
-USER_FILE_PREFIX="/config/secure/auth/user" # directory to save username/password for normal user
+# directory to save username/password for root user
+ROOT_FILE_PREFIX="/config/secure/auth/root"
+# directory to save username/password for normal user
+USER_FILE_PREFIX="/config/secure/auth/user"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # set the database directory
 DATABASE_DIR="${DATABASE_DIR_NTFY:-/data/db/ntfy}"
@@ -93,11 +102,16 @@ DATABASE_DIR="${DATABASE_DIR_NTFY:-/data/db/ntfy}"
 SERVICE_PORT="80"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # execute command variables
-SERVICE_UID="0"       # set the user id
-SERVICE_USER="root"   # execute command as another user
-EXEC_CMD_BIN="ntfy"   # command to execute
-EXEC_CMD_ARGS="serve" # command arguments
-EXEC_PRE_SCRIPT=""    # execute script before
+# set the user id
+SERVICE_UID="0"
+# execute command as another user
+SERVICE_USER="root"
+# command to execute
+EXEC_CMD_BIN="ntfy"
+# command arguments
+EXEC_CMD_ARGS="serve"
+# execute script before
+EXEC_PRE_SCRIPT=""
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Is this service a web server
 IS_WEB_SERVER="no"
@@ -109,12 +123,16 @@ IS_DATABASE_SERVICE="yes"

 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # usernames
-user_name="${NTFY_USER_NAME:-}"           # normal user name
-root_user_name="${NTFY_ROOT_USER_NAME:-}" # root user name
+# normal user name
+user_name="${NTFY_USER_NAME:-}"
+# root user name
+root_user_name="${NTFY_ROOT_USER_NAME:-}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # passwords [password/random]
-user_pass="${NTFY_USER_PASS_WORD:-}"      # normal user password
-root_user_pass="${NTFY_ROOT_PASS_WORD:-}" # root user password
+# normal user password
+user_pass="${NTFY_USER_PASS_WORD:-}"
+# root user password
+root_user_pass="${NTFY_ROOT_PASS_WORD:-}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Overwrite variables from files
 [ -f "${USER_FILE_PREFIX}/${SERVICE_NAME}_name" ] && user_name="$(<"${USER_FILE_PREFIX}/${SERVICE_NAME}_name")"
@@ -134,8 +152,10 @@ CMD_ENV=""
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # use this function to update config files - IE: change port
 __update_conf_files() {
-  local exitCode=0                   # default exit code
-  local user="${SERVICE_USER:-root}" # specifiy different user
+  # default exit code
+  local exitCode=0
+  # specifiy different user
+  local user="${SERVICE_USER:-root}"

  # delete files
  #__rm ""
@@ -181,8 +201,10 @@ __update_conf_files() {
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # function to run before executing
 __pre_execute() {
-  local exitCode=0                   # default exit code
-  local user="${SERVICE_USER:-root}" # specifiy different user
+  # default exit code
+  local exitCode=0
+  # specifiy different user
+  local user="${SERVICE_USER:-root}"
  # define commands

  # execute if directories is empty
@@ -208,10 +230,14 @@ __pre_execute() {
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # function to run after executing
 __post_execute() {
-  local exitCode=0                   # default exit code
-  local user="${SERVICE_USER:-root}" # specifiy different user
-  sleep 60                           # how long to wait before executing
-  echo "Running post commands"       # message
+  # default exit code
+  local exitCode=0
+  # specifiy different user
+  local user="${SERVICE_USER:-root}"
+  # how long to wait before executing
+  sleep 60
+  # message
+  echo "Running post commands"
  # execute commands

  return $exitCode
@@ -249,7 +275,6 @@ __create_env() {
 # EXEC_PRE_SCRIPT="${ENV_EXEC_PRE_SCRIPT:-$EXEC_PRE_SCRIPT}"        # execute before commands
 # EXEC_CMD_BIN="${ENV_EXEC_CMD_BIN:-$EXEC_CMD_BIN}"                 # command to execute
 # EXEC_CMD_ARGS="${ENV_EXEC_CMD_ARGS:-$EXEC_CMD_ARGS}"              # command arguments
-# EXEC_CMD_NAME="$(basename "$EXEC_CMD_BIN")"                       # set the binary name
 # ENV_USER_NAME="${user_name:-$ENV_USER_NAME}"                      #
 # ENV_USER_PASS="${user_pass:-$ENV_USER_PASS}"                      #
 # ENV_ROOT_USER_NAME="${root_user_name:-$ENV_ROOT_USER_NAME}"       #
@@ -344,7 +369,7 @@ __pgrep() { __pcheck "${1:-$EXEC_CMD_BIN}" || __ps aux 2>/dev/null | grep -Fw "
 # check if process is already running
 __proc_check() {
  cmd_bin="$(type -P "${1:-$EXEC_CMD_BIN}")"
-  cmd_name="$(basename "${cmd_bin:-$EXEC_CMD_NAME}")"
+  local _b="${cmd_bin:-$EXEC_CMD_NAME}"; cmd_name="${_b##*/}"
  if __pgrep "$cmd_bin" || __pgrep "$cmd_name"; then
    SERVICE_IS_RUNNING="true"
    touch "$SERVICE_PID_FILE"
@@ -358,27 +383,46 @@ __proc_check() {
 # Allow ENV_ variable - Import env file
 [ -f "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh" ] && . "/config/env/${SERVICE_NAME:-$SCRIPT_NAME}.sh"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-SERVICE_EXIT_CODE=0                                           # default exit code
-WORKDIR="${ENV_WORKDIR:-$WORKDIR}"                            # change to directory
-WWW_DIR="${ENV_WWW_DIR:-$WWW_DIR}"                            # set default web dir
-ETC_DIR="${ENV_ETC_DIR:-$ETC_DIR}"                            # set default etc dir
-DATA_DIR="${ENV_DATA_DIR:-$DATA_DIR}"                         # set default data dir
-CONF_DIR="${ENV_CONF_DIR:-$CONF_DIR}"                         # set default config dir
-DATABASE_DIR="${ENV_DATABASE_DIR:-$DATABASE_DIR}"             # set database dir
-SERVICE_USER="${ENV_SERVICE_USER:-$SERVICE_USER}"             # execute command as another user
-SERVICE_UID="${ENV_SERVICE_UID:-$SERVICE_UID}"                # set the user id
-SERVICE_PORT="${ENV_SERVICE_PORT:-$SERVICE_PORT}"             # port which service is listening on
-PRE_EXEC_MESSAGE="${ENV_PRE_EXEC_MESSAGE:-$PRE_EXEC_MESSAGE}" # Show message before execute
+# default exit code
+SERVICE_EXIT_CODE=0
+# change to directory
+WORKDIR="${ENV_WORKDIR:-$WORKDIR}"
+# set default web dir
+WWW_DIR="${ENV_WWW_DIR:-$WWW_DIR}"
+# set default etc dir
+ETC_DIR="${ENV_ETC_DIR:-$ETC_DIR}"
+# set default data dir
+DATA_DIR="${ENV_DATA_DIR:-$DATA_DIR}"
+# set default config dir
+CONF_DIR="${ENV_CONF_DIR:-$CONF_DIR}"
+# set database dir
+DATABASE_DIR="${ENV_DATABASE_DIR:-$DATABASE_DIR}"
+# execute command as another user
+SERVICE_USER="${ENV_SERVICE_USER:-$SERVICE_USER}"
+# set the user id
+SERVICE_UID="${ENV_SERVICE_UID:-$SERVICE_UID}"
+# port which service is listening on
+SERVICE_PORT="${ENV_SERVICE_PORT:-$SERVICE_PORT}"
+# Show message before execute
+PRE_EXEC_MESSAGE="${ENV_PRE_EXEC_MESSAGE:-$PRE_EXEC_MESSAGE}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # application specific
-EXEC_PRE_SCRIPT="${ENV_EXEC_PRE_SCRIPT:-$EXEC_PRE_SCRIPT}"                 # Pre
-EXEC_CMD_BIN="${ENV_EXEC_CMD_BIN:-$EXEC_CMD_BIN}"                          # command to execute
-EXEC_CMD_NAME="$(basename "$EXEC_CMD_BIN")"                                # set the binary name
-SERVICE_PID_FILE="/run/init.d/$EXEC_CMD_NAME.pid"                          # set the pid file location
-EXEC_CMD_ARGS="${ENV_EXEC_CMD_ARGS:-$EXEC_CMD_ARGS}"                       # command arguments
-SERVICE_PID_NUMBER="$(__pgrep)"                                            # check if running
-EXEC_CMD_BIN="$(type -P "$EXEC_CMD_BIN" || echo "$EXEC_CMD_BIN")"          # set full path
-EXEC_PRE_SCRIPT="$(type -P "$EXEC_PRE_SCRIPT" || echo "$EXEC_PRE_SCRIPT")" # set full path
+# Pre
+EXEC_PRE_SCRIPT="${ENV_EXEC_PRE_SCRIPT:-$EXEC_PRE_SCRIPT}"
+# command to execute
+EXEC_CMD_BIN="${ENV_EXEC_CMD_BIN:-$EXEC_CMD_BIN}"
+# set the binary name
+EXEC_CMD_NAME="${EXEC_CMD_BIN##*/}"
+# set the pid file location
+SERVICE_PID_FILE="/run/init.d/$EXEC_CMD_NAME.pid"
+# command arguments
+EXEC_CMD_ARGS="${ENV_EXEC_CMD_ARGS:-$EXEC_CMD_ARGS}"
+# check if running
+SERVICE_PID_NUMBER="$(__pgrep)"
+# set full path
+EXEC_CMD_BIN="$(type -P "$EXEC_CMD_BIN" || echo "$EXEC_CMD_BIN")"
+# set full path
+EXEC_PRE_SCRIPT="$(type -P "$EXEC_PRE_SCRIPT" || echo "$EXEC_PRE_SCRIPT")"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # create auth directories
 [ -n "$USER_FILE_PREFIX" ] && { [ -d "$USER_FILE_PREFIX" ] || mkdir -p "$USER_FILE_PREFIX"; }
@@ -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"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -1,73 +0,0 @@
-# from https://docs.ntfy.sh/config/#command-line-options
-
-NTFY_DEBUG=""
-NTFY_TRACE=""
-NTFY_NO_LOG_DATES=""
-NTFY_LOG_LEVEL=""
-NTFY_LOG_LEVEL_OVERRIDES=""
-NTFY_LOG_FORMAT=""
-NTFY_LOG_FILE=""
-NTFY_CONFIG_FILE=""
-NTFY_BASE_URL="$HOSTNAME"
-NTFY_LISTEN_HTTP=""
-NTFY_LISTEN_HTTPS=""
-NTFY_LISTEN_UNIX=""
-NTFY_LISTEN_UNIX_MODE=""
-NTFY_KEY_FILE=""
-NTFY_CERT_FILE=""
-NTFY_FIREBASE_KEY_FILE=""
-NTFY_CACHE_FILE="$DATABASE_BASE_DIR/ntfy/cache.db"
-NTFY_CACHE_DURATION=""
-NTFY_BATCH_SIZE=""
-NTFY_CACHE_BATCH_TIMEOUT=""
-NTFY_CACHE_STARTUP_QUERIES=""
-NTFY_AUTH_FILE="$DATABASE_BASE_DIR/ntfy/auth.db"
-NTFY_AUTH_STARTUP_QUERIES=""
-NTFY_AUTH_DEFAULT_ACCESS=""
-NTFY_ATTACHMENT_CACHE_DIR=""
-NTFY_ATTACHMENT_TOTAL_SIZE_LIMIT=""
-NTFY_ATTACHMENT_FILE_SIZE_LIMIT=""
-NTFY_ATTACHMENT_EXPIRY_DURATION=""
-NTFY_KEEPALIVE_INTERVAL=""
-NTFY_MANAGER_INTERVAL=""
-NTFY_DISALLOWED_TOPICS=""
-NTFY_WEB_ROOT=""
-NTFY_ENABLE_SIGNUP="true"
-NTFY_ENABLE_LOGIN="true"
-NTFY_ENABLE_RESERVATIONS=""
-NTFY_UPSTREAM_BASE_URL=""
-NTFY_UPSTREAM_ACCESS_TOKEN=""
-NTFY_SMTP_SENDER_ADDR=""
-NTFY_SMTP_SENDER_USER=""
-NTFY_SMTP_SENDER_PASS=""
-NTFY_SMTP_SENDER_FROM=""
-NTFY_SMTP_SERVER_LISTEN=""
-NTFY_SMTP_SERVER_DOMAIN=""
-NTFY_SMTP_SERVER_ADDR_PREFIX=""
-NTFY_TWILIO_ACCOUNT=""
-NTFY_TWILIO_AUTH_TOKEN=""
-NTFY_TWILIO_PHONE_NUMBER=""
-NTFY_TWILIO_VERIFY_SERVICE=""
-NTFY_GLOBAL_TOPIC_LIMIT=""
-NTFY_VISITOR_SUBSCRIPTION_LIMIT=""
-NTFY_VISITOR_ATTACHMENT_TOTAL_SIZE_LIMIT=""
-NTFY_VISITOR_ATTACHMENT_DAILY_BANDWIDTH_LIMIT=""
-NTFY_VISITOR_REQUEST_LIMIT_BURST=""
-NTFY_VISITOR_REQUEST_LIMIT_REPLENISH=""
-NTFY_VISITOR_REQUEST_LIMIT_EXEMPT_HOSTS=""
-NTFY_VISITOR_MESSAGE_DAILY_LIMIT=""
-NTFY_VISITOR_EMAIL_LIMIT_BURST=""
-NTFY_VISITOR_EMAIL_LIMIT_REPLENISH=""
-NTFY_VISITOR_SUBSCRIBER_RATE_LIMITING=""
-NTFY_BEHIND_PROXY=""
-NTFY_STRIPE_SECRET_KEY=""
-NTFY_STRIPE_WEBHOOK_KEY=""
-NTFY_BILLING_CONTACT=""
-NTFY_ENABLE_METRICS=""
-NTFY_METRICS_LISTEN_HTTP=""
-NTFY_PROFILE_LISTEN_HTTP=""
-NTFY_WEB_PUSH_PUBLIC_KEY=""
-NTFY_WEB_PUSH_PRIVATE_KEY=""
-NTFY_WEB_PUSH_FILE=""
-NTFY_WEB_PUSH_EMAIL_ADDRESS=""
-NTFY_WEB_PUSH_STARTUP_QUERIES=""
@@ -1,57 +0,0 @@
-# ntfy client config file
-
-# Base URL used to expand short topic names in the "ntfy publish" and "ntfy subscribe" commands.
-# If you self-host a ntfy server, you'll likely want to change this.
-#
-# default-host: https://ntfy.sh
-
-# Default credentials will be used with "ntfy publish" and "ntfy subscribe" if no other credentials are provided.
-# You can set a default token to use or a default user:password combination, but not both. For an empty password,
-# use empty double-quotes ("").
-#
-# To override the default user:password combination or default token for a particular subscription (e.g., to send
-# no Authorization header), set the user:pass/token for the subscription to empty double-quotes ("").
-
-# default-token:
-
-# default-user:
-# default-password:
-
-# Default command will execute after "ntfy subscribe" receives a message if no command is provided in subscription below
-# default-command:
-
-# Subscriptions to topics and their actions. This option is primarily used by the systemd service,
-# or if you cann "ntfy subscribe --from-config" directly.
-#
-# Example:
-#     subscribe:
-#       - topic: mytopic
-#         command: /usr/local/bin/mytopic-triggered.sh
-#       - topic: myserver.com/anothertopic
-#         command: 'echo "$message"'
-#         if:
-#             priority: high,urgent
-#       - topic: secret
-#         command: 'notify-send "$m"'
-#         user: phill
-#         password: mypass
-#       - topic: token_topic
-#         token: tk_AgQdq7mVBoFD37zQVN29RhuMzNIz2
-#
-# Variables:
-#     Variable        Aliases               Description
-#     --------------- --------------------- -----------------------------------
-#     $NTFY_ID        $id                   Unique message ID
-#     $NTFY_TIME      $time                 Unix timestamp of the message delivery
-#     $NTFY_TOPIC     $topic                Topic name
-#     $NTFY_MESSAGE   $message, $m          Message body
-#     $NTFY_TITLE     $title, $t            Message title
-#     $NTFY_PRIORITY  $priority, $prio, $p  Message priority (1=min, 5=max)
-#     $NTFY_TAGS      $tags, $tag, $ta      Message tags (comma separated list)
-#     $NTFY_RAW       $raw                  Raw JSON message
-#
-# Filters ('if:'):
-#     You can filter 'message', 'title', 'priority' (comma-separated list, logical OR)
-#     and 'tags' (comma-separated list, logical AND). See https://ntfy.sh/docs/subscribe/api/#filter-messages.
-#
-# subscribe:
@@ -1,363 +0,0 @@
-# ntfy server config file
-#
-# Please refer to the documentation at https://ntfy.sh/docs/config/ for details.
-# All options also support underscores (_) instead of dashes (-) to comply with the YAML spec.
-
-# Public facing base URL of the service (e.g. https://ntfy.sh or https://ntfy.example.com)
-#
-# This setting is required for any of the following features:
-# - attachments (to return a download URL)
-# - e-mail sending (for the topic URL in the email footer)
-# - iOS push notifications for self-hosted servers (to calculate the Firebase poll_request topic)
-# - Matrix Push Gateway (to validate that the pushkey is correct)
-#
-# base-url:
-
-# Listen address for the HTTP & HTTPS web server. If "listen-https" is set, you must also
-# set "key-file" and "cert-file". Format: [<ip>]:<port>, e.g. "1.2.3.4:8080".
-#
-# To listen on all interfaces, you may omit the IP address, e.g. ":443".
-# To disable HTTP, set "listen-http" to "-".
-#
-# listen-http: ":80"
-# listen-https:
-
-# Listen on a Unix socket, e.g. /var/lib/ntfy/ntfy.sock
-# This can be useful to avoid port issues on local systems, and to simplify permissions.
-#
-# listen-unix: <socket-path>
-# listen-unix-mode: <linux permissions, e.g. 0700>
-
-# Path to the private key & cert file for the HTTPS web server. Not used if "listen-https" is not set.
-#
-# key-file: <filename>
-# cert-file: <filename>
-
-# If set, also publish messages to a Firebase Cloud Messaging (FCM) topic for your app.
-# This is optional and only required to save battery when using the Android app.
-#
-# firebase-key-file: <filename>
-
-# If "cache-file" is set, messages are cached in a local SQLite database instead of only in-memory.
-# This allows for service restarts without losing messages in support of the since= parameter.
-#
-# The "cache-duration" parameter defines the duration for which messages will be buffered
-# before they are deleted. This is required to support the "since=..." and "poll=1" parameter.
-# To disable the cache entirely (on-disk/in-memory), set "cache-duration" to 0.
-# The cache file is created automatically, provided that the correct permissions are set.
-#
-# The "cache-startup-queries" parameter allows you to run commands when the database is initialized,
-# e.g. to enable WAL mode (see https://phiresky.github.io/blog/2020/sqlite-performance-tuning/)).
-# Example:
-#    cache-startup-queries: |
-#       pragma journal_mode = WAL;
-#       pragma synchronous = normal;
-#       pragma temp_store = memory;
-#       pragma busy_timeout = 15000;
-#       vacuum;
-#
-# The "cache-batch-size" and "cache-batch-timeout" parameter allow enabling async batch writing
-# of messages. If set, messages will be queued and written to the database in batches of the given
-# size, or after the given timeout. This is only required for high volume servers.
-#
-# Debian/RPM package users:
-#   Use /var/cache/ntfy/cache.db as cache file to avoid permission issues. The package
-#   creates this folder for you.
-#
-# Check your permissions:
-#   If you are running ntfy with systemd, make sure this cache file is owned by the
-#   ntfy user and group by running: chown ntfy.ntfy <filename>.
-#
-# cache-file: <filename>
-# cache-duration: "12h"
-# cache-startup-queries:
-# cache-batch-size: 0
-# cache-batch-timeout: "0ms"
-
-# If set, access to the ntfy server and API can be controlled on a granular level using
-# the 'ntfy user' and 'ntfy access' commands. See the --help pages for details, or check the docs.
-#
-# - auth-file is the SQLite user/access database; it is created automatically if it doesn't already exist
-# - auth-default-access defines the default/fallback access if no access control entry is found; it can be
-#   set to "read-write" (default), "read-only", "write-only" or "deny-all".
-# - auth-startup-queries allows you to run commands when the database is initialized, e.g. to enable
-#   WAL mode. This is similar to cache-startup-queries. See above for details.
-#
-# Debian/RPM package users:
-#   Use /var/lib/ntfy/user.db as user database to avoid permission issues. The package
-#   creates this folder for you.
-#
-# Check your permissions:
-#   If you are running ntfy with systemd, make sure this user database file is owned by the
-#   ntfy user and group by running: chown ntfy.ntfy <filename>.
-#
-# auth-file: <filename>
-# auth-default-access: "read-write"
-# auth-startup-queries:
-
-# If set, the X-Forwarded-For header is used to determine the visitor IP address
-# instead of the remote address of the connection.
-#
-# WARNING: If you are behind a proxy, you must set this, otherwise all visitors are rate limited
-#          as if they are one.
-#
-# behind-proxy: false
-
-# If enabled, clients can attach files to notifications as attachments. Minimum settings to enable attachments
-# are "attachment-cache-dir" and "base-url".
-#
-# - attachment-cache-dir is the cache directory for attached files
-# - attachment-total-size-limit is the limit of the on-disk attachment cache directory (total size)
-# - attachment-file-size-limit is the per-file attachment size limit (e.g. 300k, 2M, 100M)
-# - attachment-expiry-duration is the duration after which uploaded attachments will be deleted (e.g. 3h, 20h)
-#
-# attachment-cache-dir:
-# attachment-total-size-limit: "5G"
-# attachment-file-size-limit: "15M"
-# attachment-expiry-duration: "3h"
-
-# If enabled, allow outgoing e-mail notifications via the 'X-Email' header. If this header is set,
-# messages will additionally be sent out as e-mail using an external SMTP server.
-#
-# As of today, only SMTP servers with plain text auth (or no auth at all), and STARTLS are supported.
-# Please also refer to the rate limiting settings below (visitor-email-limit-burst & visitor-email-limit-burst).
-#
-# - smtp-sender-addr is the hostname:port of the SMTP server
-# - smtp-sender-from is the e-mail address of the sender
-# - smtp-sender-user/smtp-sender-pass are the username and password of the SMTP user (leave blank for no auth)
-#
-# smtp-sender-addr:
-# smtp-sender-from:
-# smtp-sender-user:
-# smtp-sender-pass:
-
-# If enabled, ntfy will launch a lightweight SMTP server for incoming messages. Once configured, users can send
-# emails to a topic e-mail address to publish messages to a topic.
-#
-# - smtp-server-listen defines the IP address and port the SMTP server will listen on, e.g. :25 or 1.2.3.4:25
-# - smtp-server-domain is the e-mail domain, e.g. ntfy.sh
-# - smtp-server-addr-prefix is an optional prefix for the e-mail addresses to prevent spam. If set to "ntfy-",
-#   for instance, only e-mails to ntfy-$topic@ntfy.sh will be accepted. If this is not set, all emails to
-#   $topic@ntfy.sh will be accepted (which may obviously be a spam problem).
-#
-# smtp-server-listen:
-# smtp-server-domain:
-# smtp-server-addr-prefix:
-
-# Web Push support (background notifications for browsers)
-#
-# If enabled, allows ntfy to receive push notifications, even when the ntfy web app is closed. When enabled, users
-# can enable background notifications in the web app. Once enabled, ntfy will forward published messages to the push
-# endpoint, which will then forward it to the browser.
-#
-# You must configure web-push-public/private key, web-push-file, and web-push-email-address below to enable Web Push.
-# Run "ntfy webpush keys" to generate the keys.
-#
-# - web-push-public-key is the generated VAPID public key, e.g. AA1234BBCCddvveekaabcdfqwertyuiopasdfghjklzxcvbnm1234567890
-# - web-push-private-key is the generated VAPID private key, e.g. AA2BB1234567890abcdefzxcvbnm1234567890
-# - web-push-file is a database file to keep track of browser subscription endpoints, e.g. `/var/cache/ntfy/webpush.db`
-# - web-push-email-address is the admin email address send to the push provider, e.g. `sysadmin@example.com`
-# - web-push-startup-queries is an optional list of queries to run on startup`
-#
-# web-push-public-key:
-# web-push-private-key:
-# web-push-file:
-# web-push-email-address:
-# web-push-startup-queries:
-
-# If enabled, ntfy can perform voice calls via Twilio via the "X-Call" header.
-#
-# - twilio-account is the Twilio account SID, e.g. AC12345beefbeef67890beefbeef122586
-# - twilio-auth-token is the Twilio auth token, e.g. affebeef258625862586258625862586
-# - twilio-phone-number is the outgoing phone number you purchased, e.g. +18775132586
-# - twilio-verify-service is the Twilio Verify service SID, e.g. VA12345beefbeef67890beefbeef122586
-#
-# twilio-account:
-# twilio-auth-token:
-# twilio-phone-number:
-# twilio-verify-service:
-
-# Interval in which keepalive messages are sent to the client. This is to prevent
-# intermediaries closing the connection for inactivity.
-#
-# Note that the Android app has a hardcoded timeout at 77s, so it should be less than that.
-#
-# keepalive-interval: "45s"
-
-# Interval in which the manager prunes old messages, deletes topics
-# and prints the stats.
-#
-# manager-interval: "1m"
-
-# Defines topic names that are not allowed, because they are otherwise used. There are a few default topics
-# that cannot be used (e.g. app, account, settings, ...). To extend the default list, define them here.
-#
-# Example:
-#   disallowed-topics:
-#     - about
-#     - pricing
-#     - contact
-#
-# disallowed-topics:
-
-# Defines the root path of the web app, or disables the web app entirely.
-#
-# Can be any simple path, e.g. "/", "/app", or "/ntfy". For backwards-compatibility reasons,
-# the values "app" (maps to "/"), "home" (maps to "/app"), or "disable" (maps to "") to disable
-# the web app entirely.
-#
-# web-root: /
-
-# Various feature flags used to control the web app, and API access, mainly around user and
-# account management.
-#
-# - enable-signup allows users to sign up via the web app, or API
-# - enable-login allows users to log in via the web app, or API
-# - enable-reservations allows users to reserve topics (if their tier allows it)
-#
-# enable-signup: false
-# enable-login: false
-# enable-reservations: false
-
-# Server URL of a Firebase/APNS-connected ntfy server (likely "https://ntfy.sh").
-#
-# iOS users:
-#   If you use the iOS ntfy app, you MUST configure this to receive timely notifications. You'll like want this:
-#   upstream-base-url: "https://ntfy.sh"
-#
-# If set, all incoming messages will publish a "poll_request" message to the configured upstream server, containing
-# the message ID of the original message, instructing the iOS app to poll this server for the actual message contents.
-# This is to prevent the upstream server and Firebase/APNS from being able to read the message.
-#
-# - upstream-base-url is the base URL of the upstream server. Should be "https://ntfy.sh".
-# - upstream-access-token is the token used to authenticate with the upstream server. This is only required
-#   if you exceed the upstream rate limits, or the uptream server requires authentication.
-#
-# upstream-base-url:
-# upstream-access-token:
-
-# Rate limiting: Total number of topics before the server rejects new topics.
-#
-# global-topic-limit: 15000
-
-# Rate limiting: Number of subscriptions per visitor (IP address)
-#
-# visitor-subscription-limit: 30
-
-# Rate limiting: Allowed GET/PUT/POST requests per second, per visitor:
-# - visitor-request-limit-burst is the initial bucket of requests each visitor has
-# - visitor-request-limit-replenish is the rate at which the bucket is refilled
-# - visitor-request-limit-exempt-hosts is a comma-separated list of hostnames, IPs or CIDRs to be
-#   exempt from request rate limiting. Hostnames are resolved at the time the server is started.
-#   Example: "1.2.3.4,ntfy.example.com,8.7.6.0/24"
-#
-# visitor-request-limit-burst: 60
-# visitor-request-limit-replenish: "5s"
-# visitor-request-limit-exempt-hosts: ""
-
-# Rate limiting: Hard daily limit of messages per visitor and day. The limit is reset
-# every day at midnight UTC. If the limit is not set (or set to zero), the request
-# limit (see above) governs the upper limit.
-#
-# visitor-message-daily-limit: 0
-
-# Rate limiting: Allowed emails per visitor:
-# - visitor-email-limit-burst is the initial bucket of emails each visitor has
-# - visitor-email-limit-replenish is the rate at which the bucket is refilled
-#
-# visitor-email-limit-burst: 16
-# visitor-email-limit-replenish: "1h"
-
-# Rate limiting: Attachment size and bandwidth limits per visitor:
-# - visitor-attachment-total-size-limit is the total storage limit used for attachments per visitor
-# - visitor-attachment-daily-bandwidth-limit is the total daily attachment download/upload traffic limit per visitor
-#
-# visitor-attachment-total-size-limit: "100M"
-# visitor-attachment-daily-bandwidth-limit: "500M"
-
-# Rate limiting: Enable subscriber-based rate limiting (mostly used for UnifiedPush)
-#
-# If enabled, subscribers may opt to have published messages counted against their own rate limits, as opposed
-# to the publisher's rate limits. This is especially useful to increase the amount of messages that high-volume
-# publishers (e.g. Matrix/Mastodon servers) are allowed to send.
-#
-# Once enabled, a client may send a "Rate-Topics: <topic1>,<topic2>,..." header when subscribing to topics via
-# HTTP stream, or websockets, thereby registering itself as the "rate visitor", i.e. the visitor whose rate limits
-# to use when publishing on this topic. Note: Setting the rate visitor requires READ-WRITE permission on the topic.
-#
-# UnifiedPush only: If this setting is enabled, publishing to UnifiedPush topics will lead to a HTTP 507 response if
-# no "rate visitor" has been previously registered. This is to avoid burning the publisher's "visitor-message-daily-limit".
-#
-# visitor-subscriber-rate-limiting: false
-
-# Payments integration via Stripe
-#
-# - stripe-secret-key is the key used for the Stripe API communication. Setting this values
-#   enables payments in the ntfy web app (e.g. Upgrade dialog). See https://dashboard.stripe.com/apikeys.
-# - stripe-webhook-key is the key required to validate the authenticity of incoming webhooks from Stripe.
-#   Webhooks are essential up keep the local database in sync with the payment provider. See https://dashboard.stripe.com/webhooks.
-# - billing-contact is an email address or website displayed in the "Upgrade tier" dialog to let people reach
-#   out with billing questions. If unset, nothing will be displayed.
-#
-# stripe-secret-key:
-# stripe-webhook-key:
-# billing-contact:
-
-# Metrics
-#
-# ntfy can expose Prometheus-style metrics via a /metrics endpoint, or on a dedicated listen IP/port.
-# Metrics may be considered sensitive information, so before you enable them, be sure you know what you are
-# doing, and/or secure access to the endpoint in your reverse proxy.
-#
-# - enable-metrics enables the /metrics endpoint for the default ntfy server (i.e. HTTP, HTTPS and/or Unix socket)
-# - metrics-listen-http exposes the metrics endpoint via a dedicated [IP]:port. If set, this option implicitly
-#   enables metrics as well, e.g. "10.0.1.1:9090" or ":9090"
-#
-# enable-metrics: false
-# metrics-listen-http:
-
-# Profiling
-#
-# ntfy can expose Go's net/http/pprof endpoints to support profiling of the ntfy server. If enabled, ntfy will listen
-# on a dedicated listen IP/port, which can be accessed via the web browser on http://<ip>:<port>/debug/pprof/.
-# This can be helpful to expose bottlenecks, and visualize call flows. See https://pkg.go.dev/net/http/pprof for details.
-#
-# profile-listen-http:
-
-# Logging options
-#
-# By default, ntfy logs to the console (stderr), with an "info" log level, and in a human-readable text format.
-# ntfy supports five different log levels, can also write to a file, log as JSON, and even supports granular
-# log level overrides for easier debugging. Some options (log-level and log-level-overrides) can be hot reloaded
-# by calling "kill -HUP $pid" or "systemctl reload ntfy".
-#
-# - log-format defines the output format, can be "text" (default) or "json"
-# - log-file is a filename to write logs to. If this is not set, ntfy logs to stderr.
-# - log-level defines the default log level, can be one of "trace", "debug", "info" (default), "warn" or "error".
-#   Be aware that "debug" (and particularly "trace") can be VERY CHATTY. Only turn them on briefly for debugging purposes.
-# - log-level-overrides lets you override the log level if certain fields match. This is incredibly powerful
-#   for debugging certain parts of the system (e.g. only the account management, or only a certain visitor).
-#   This is an array of strings in the format:
-#      - "field=value -> level" to match a value exactly, e.g. "tag=manager -> trace"
-#      - "field -> level" to match any value, e.g. "time_taken_ms -> debug"
-#   Warning: Using log-level-overrides has a performance penalty. Only use it for temporary debugging.
-#
-# Check your permissions:
-#   If you are running ntfy with systemd, make sure this log file is owned by the
-#   ntfy user and group by running: chown ntfy.ntfy <filename>.
-#
-# Example (good for production):
-#   log-level: info
-#   log-format: json
-#   log-file: /var/log/ntfy.log
-#
-# Example level overrides (for debugging, only use temporarily):
-#   log-level-overrides:
-#      - "tag=manager -> trace"
-#      - "visitor_ip=1.2.3.4 -> debug"
-#      - "time_taken_ms -> debug"
-#
-# log-level: info
-# log-level-overrides:
-# log-format: text
-# log-file: