diff --git a/rootfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh index 332fc3d..d8ed80a 100755 --- a/rootfs/root/docker/setup/03-files.sh +++ b/rootfs/root/docker/setup/03-files.sh @@ -1,49 +1,39 @@ #!/usr/bin/env bash -# shellcheck shell=bash -# - - - - - - - - - - - - - - - - - - - - - - - - - -##@Version : 202605051438-git +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +##@Version : 202606041215-git # @@Author : CasjaysDev # @@Contact : CasjaysDev -# @@License : MIT -# @@Copyright : Copyright 2026 CasjaysDev -# @@Created : Tue May 5 02:38:04 PM EDT 2026 +# @@License : WTFPL +# @@ReadME : +# @@Copyright : Copyright: (c) 2023 CasjaysDev +# @@Created : Mon Aug 28 06:48:42 PM EDT 2023 # @@File : 03-files.sh # @@Description : script to run files -# @@Changelog : newScript -# @@TODO : Refactor code -# @@Other : N/A -# @@Resource : N/A -# @@Terminal App : yes -# @@sudo/root : yes -# @@Template : templates/dockerfiles/init_scripts/03-files.sh -# - - - - - - - - - - - - - - - - - - - - - - - - - +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +# shellcheck shell=bash # shellcheck disable=SC1001,SC1003,SC2001,SC2003,SC2016,SC2031,SC2090,SC2115,SC2120,SC2155,SC2199,SC2229,SC2317,SC2329 -# - - - - - - - - - - - - - - - - - - - - - - - - - -# Set bash options +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - set -o pipefail [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -x$DEBUGGER_OPTIONS -# - - - - - - - - - - - - - - - - - - - - - - - - - -# Set env variables +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - exitCode=0 - -# - - - - - - - - - - - - - - - - - - - - - - - - - -# Predefined actions +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if [ -d "/tmp/bin" ]; then - mkdir -p "/usr/local/bin" + \mkdir -p "/usr/local/bin" for bin in "/tmp/bin"/*; do - name="$(basename -- "$bin")" + name="${bin##*/}" echo "Installing $name to /usr/local/bin/$name" copy "$bin" "/usr/local/bin/$name" - chmod -f +x "/usr/local/bin/$name" + \chmod -f +x "/usr/local/bin/$name" done fi unset bin if [ -d "/tmp/var" ]; then for var in "/tmp/var"/*; do - name="$(basename -- "$var")" + name="${var##*/}" echo "Installing $var to /var/$name" if [ -d "$var" ]; then - mkdir -p "/var/$name" + \mkdir -p "/var/$name" copy "$var/." "/var/$name/" else copy "$var" "/var/$name" @@ -53,42 +43,32 @@ fi unset var if [ -d "/tmp/etc" ]; then for config in "/tmp/etc"/*; do - name="$(basename -- "$config")" + name="${config##*/}" echo "Installing $config to /etc/$name" if [ -d "$config" ]; then - mkdir -p "/etc/$name" + \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="${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 -# - - - - - - - - - - - - - - - - - - - - - - - - - -# Main script - -# - - - - - - - - - - - - - - - - - - - - - - - - - -# Set the exit code -#exitCode=$? -# - - - - - - - - - - - - - - - - - - - - - - - - - +unset usrpath +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +exitCode=$? +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - exit $exitCode -# - - - - - - - - - - - - - - - - - - - - - - - - - # ex: ts=2 sw=2 et filetype=sh -# - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/rootfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh index 10642d8..46003c3 100644 --- a/rootfs/usr/local/etc/docker/functions/entrypoint.sh +++ b/rootfs/usr/local/etc/docker/functions/entrypoint.sh @@ -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 [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// when that subdir is empty + # extra_etc_path file → copied to conf_dir/ 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 [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