diff --git a/.gitea/workflows/docker.yaml b/.gitea/workflows/docker.yaml
new file mode 100644
index 0000000..50518eb
--- /dev/null
+++ b/.gitea/workflows/docker.yaml
@@ -0,0 +1,49 @@
+name: release-tag
+
+on: push
+
+jobs:
+  release-image:
+    runs-on: ubuntu-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
+    env:
+      RUNNER_TOOL_CACHE: /toolcache
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Get Meta
+        id: meta
+        run: |
+          echo REPO_VERSION=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT
+          echo DOCKER_ORG=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $1}') >> $GITHUB_OUTPUT
+          echo DOCKER_TAG=$([ -n "$DOCKER_TAG" ] && echo ${DOCKER_TAG} || echo "latest") >> $GITHUB_OUTPUT
+          echo DOCKER_HUB=$([ -n "$DOCKER_HUB" ] && echo ${DOCKER_HUB} || echo "docker.io") >> $GITHUB_OUTPUT
+          echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}' | sed 's|^docker-||g') >> $GITHUB_OUTPUT
+          echo "$DOCKER_HUB/$DOCKER_ORG/$REPO_NAME:$DOCKER_TAG"
+
+      - name: Set up Docker BuildX
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          password: ${{ secrets.DOCKER_TOKEN }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          registry: ${{ steps.meta.outputs.DOCKER_HUB }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: |
+            linux/amd64
+            linux/arm64
+          push: true
+          tags: | # replace it with your local IP and tags
+            ${{ steps.meta.outputs.DOCKER_HUB }}/${{ steps.meta.outputs.DOCKER_ORG }}/${{ steps.meta.outputs.REPO_NAME }}:${{ steps.meta.outputs.DOCKER_TAG }}
diff --git a/Dockerfile b/Dockerfile
index b7aa1d2..79bd2b7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -165,4 +165,4 @@ EXPOSE ${ENV_PORTS}
 
 CMD [ "" ]
 ENTRYPOINT [ "tini", "--", "/usr/local/bin/entrypoint.sh" ]
-HEALTHCHECK --start-period=1m --interval=2m --timeout=3s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
+HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh
index 533cf1f..81e3928 100755
--- a/rootfs/usr/local/bin/entrypoint.sh
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -1,31 +1,45 @@
 #!/usr/bin/env bash
 # shellcheck shell=bash
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202303102006-git
+##@Version           :  202407271336-git
 # @@Author           :  Jason Hempstead
 # @@Contact          :  jason@casjaysdev.pro
 # @@License          :  WTFPL
 # @@ReadME           :  entrypoint.sh --help
-# @@Copyright        :  Copyright: (c) 2023 Jason Hempstead, Casjays Developments
-# @@Created          :  Friday, Mar 10, 2023 20:06 EST
+# @@Copyright        :  Copyright: (c) 2024 Jason Hempstead, Casjays Developments
+# @@Created          :  Saturday, Jul 27, 2024 13:36 EDT
 # @@File             :  entrypoint.sh
-# @@Description      :  entrypoint point for buildah
+# @@Description      :  Entrypoint file for buildah
 # @@Changelog        :  New script
 # @@TODO             :  Better documentation
-# @@Other            :
-# @@Resource         :
+# @@Other            :  
+# @@Resource         :  
 # @@Terminal App     :  no
 # @@sudo/root        :  no
 # @@Template         :  other/docker-entrypoint
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# shellcheck disable=SC2016
+# shellcheck disable=SC2031
+# shellcheck disable=SC2120
+# shellcheck disable=SC2155
+# shellcheck disable=SC2199
+# shellcheck disable=SC2317
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
+[ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}"
+{ [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; } && echo "Enabling debugging" && set -o pipefail -x$DEBUGGER_OPTIONS && export DEBUGGER="on" || set -o pipefail
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+PATH="/usr/local/etc/docker/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Set bash options
-SCRIPT_NAME="$(basename "$0" 2>/dev/null)"
-[ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -o pipefail -x$DEBUGGER_OPTIONS || set -o pipefail
+SCRIPT_FILE="$0"
+CONTAINER_NAME="buildah"
+SCRIPT_NAME="$(basename "$SCRIPT_FILE" 2>/dev/null)"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # remove whitespaces from beginning argument
 while :; do [ "$1" = " " ] && shift 1 || break; done
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-[ "$1" = "$0" ] && shift 1
+[ "$1" = "$SCRIPT_FILE" ] && shift 1
 [ "$1" = "$SCRIPT_NAME" ] && shift 1
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # import the functions file
@@ -37,84 +51,137 @@ else
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Create the default env files
-__create_env "/config/env/default.sh" "/root/env.sh" &>/dev/null
+__create_env_file "/config/env/default.sh" "/root/env.sh" &>/dev/null
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # import variables from files
 for set_env in "/root/env.sh" "/usr/local/etc/docker/env"/*.sh "/config/env"/*.sh; do
   [ -f "$set_env" ] && . "$set_env"
 done
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Custom functions
-
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Define script variables
-SERVICE_USER="root" # execute command as another user
-SERVICE_GROUP=""    # Set user group for permission fix
-SERVICE_UID="0"     # set the user id for creation of user
-SERVICE_PORT=""     # specifiy port which service is listening on
+RUNAS_USER=""    # Default is root
+SERVICE_UID=""   # set the user id
+SERVICE_GID=""   # set the group id
+SERVICE_USER=""  # execute command as another user
+SERVICE_GROUP="" # Set the service group
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Primary server port- will be added to server ports
+WEB_SERVER_PORT="" # port : 80,443
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Secondary ports
+SERVER_PORTS="" # specifiy other ports
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Server directories
+WWW_ROOT_DIR="" # set default web dir
+DATABASE_DIR="" # set database dir
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Healthcheck variables
 HEALTH_ENABLED="yes" # enable healthcheck [yes/no]
 SERVICES_LIST="tini" # comma seperated list of processes for the healthcheck
-SERVER_PORTS=""      # ports : 80,443
 HEALTH_ENDPOINTS=""  # url endpoints: [http://localhost/health,http://localhost/test]
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Additional
-PHP_INI_DIR="${PHP_INI_DIR:-$(__find_php_ini)}"
-PHP_BIN_DIR="${PHP_BIN_DIR:-$(__find_php_bin)}"
-HTTPD_CONFIG_FILE="${HTTPD_CONFIG_FILE:-$(__find_httpd_conf)}"
-NGINX_CONFIG_FILE="${NGINX_CONFIG_FILE:-$(__find_nginx_conf)}"
-MYSQL_CONFIG_FILE="${MYSQL_CONFIG_FILE:-$(__find_mysql_conf)}"
-PGSQL_CONFIG_FILE="${PGSQL_CONFIG_FILE:-$(__find_pgsql_conf)}"
-MONGODB_CONFIG_FILE="${MONGODB_CONFIG_FILE:-$(__find_mongodb_conf)}"
+# Update path var
+export PATH="${PATH:-}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Overwrite variables
+# Custom variables
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Last thing to run before options
-__run_pre() {
-
-  return 0
-}
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# show message
 __run_message() {
 
   return
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# rewrite variables
-ENV_PORTS="${ENV_PORTS//,/ }"
-ENV_PORTS="${ENV_PORTS//\/*/}"
-SERVER_PORTS="${SERVER_PORTS//,/ }"
-WEB_SERVER_PORTS="${SERVICE_PORT//\/*/}"
-HEALTH_ENDPOINTS="${HEALTH_ENDPOINTS//,/ }"
-WEB_SERVER_PORTS="${WEB_SERVER_PORTS//\/*/}"
-WEB_SERVER_PORTS="${SERVICE_PORT//,/ } ${WEB_SERVER_PORTS//,/ }"
-ENV_PORTS="$(echo "$ENV_PORTS" | tr ' ' '\n' | sort -u | grep -v '^$' | tr '\n' ' ' | grep '^' || false)"
-WEB_SERVER_PORTS="$(echo "$WEB_SERVER_PORTS" | tr ' ' '\n' | sort -u | grep -v '^$' | tr '\n' ' ' | grep '^' || false)"
-ENV_PORTS="$(echo "$SERVER_PORTS" "$WEB_SERVER_PORTS" "$ENV_PORTS" "$SERVER_PORTS" | tr ' ' '\n' | sort -u | grep -v '^$' | tr '\n' ' ' | grep '^' || false)"
+################## END OF CONFIGURATION #####################
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Startup variables
+export INIT_DATE="${INIT_DATE:-$(date)}"
+export CONTAINER_INIT="${CONTAINER_INIT:-no}"
+export START_SERVICES="${START_SERVICES:-yes}"
+export ENTRYPOINT_MESSAGE="${ENTRYPOINT_MESSAGE:-yes}"
+export ENTRYPOINT_FIRST_RUN="${ENTRYPOINT_FIRST_RUN:-yes}"
+export DATA_DIR_INITIALIZED="${DATA_DIR_INITIALIZED:-no}"
+export CONFIG_DIR_INITIALIZED="${CONFIG_DIR_INITIALIZED:-no}"
+export CONTAINER_NAME="${ENV_CONTAINER_NAME:-$CONTAINER_NAME}"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# System
+export LANG="${LANG:-C.UTF-8}"
+export LC_ALL="${LANG:-C.UTF-8}"
+export TZ="${TZ:-${TIMEZONE:-America/New_York}}"
+export HOSTNAME="${FULL_DOMAIN_NAME:-${SERVER_HOSTNAME:-$HOSTNAME}}"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Default directories
+export SSL_DIR="${SSL_DIR:-/config/ssl}"
+export SSL_CA="${SSL_CERT:-/config/ssl/ca.crt}"
+export SSL_KEY="${SSL_KEY:-/config/ssl/localhost.pem}"
+export SSL_CERT="${SSL_CERT:-/config/ssl/localhost.crt}"
+export BACKUP_DIR="${BACKUP_DIR:-/data/backups}"
+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}"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional
+export PHP_INI_DIR="${PHP_INI_DIR:-$(__find_php_ini)}"
+export PHP_BIN_DIR="${PHP_BIN_DIR:-$(__find_php_bin)}"
+export HTTPD_CONFIG_FILE="${HTTPD_CONFIG_FILE:-$(__find_httpd_conf)}"
+export NGINX_CONFIG_FILE="${NGINX_CONFIG_FILE:-$(__find_nginx_conf)}"
+export MYSQL_CONFIG_FILE="${MYSQL_CONFIG_FILE:-$(__find_mysql_conf)}"
+export PGSQL_CONFIG_FILE="${PGSQL_CONFIG_FILE:-$(__find_pgsql_conf)}"
+export MONGODB_CONFIG_FILE="${MONGODB_CONFIG_FILE:-$(__find_mongodb_conf)}"
+export ENTRYPOINT_PID_FILE="${ENTRYPOINT_PID_FILE:-/run/init.d/entrypoint.pid}"
+export ENTRYPOINT_INIT_FILE="${ENTRYPOINT_INIT_FILE:-/config/.entrypoint.done}"
+export ENTRYPOINT_DATA_INIT_FILE="${ENTRYPOINT_DATA_INIT_FILE:-/data/.docker_has_run}"
+export ENTRYPOINT_CONFIG_INIT_FILE="${ENTRYPOINT_CONFIG_INIT_FILE:-/config/.docker_has_run}"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+if [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; then
+  START_SERVICES="no" ENTRYPOINT_MESSAGE="no" ENTRYPOINT_FIRST_RUN="no"
+fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # variables based on env/files
-[ "$SERVICE_PORT" = "443" ] && SSL_ENABLED="true"
-[ -f "/config/.enable_ssh" ] && SSL_ENABLED="true"
+[ -f "/config/enable/ssl" ] && SSL_ENABLED="yes"
+[ -f "/config/enable/ssh" ] && SSH_ENABLED="yes"
+[ "$WEB_SERVER_PORT" = "443" ] && SSL_ENABLED="yes"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # export variables
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Default directories
-BACKUP_DIR="${BACKUP_DIR:-/data/backups}"
-WWW_ROOT_DIR="${WWW_ROOT_DIR:-/data/htdocs}"
-LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}"
-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}"
+# is already Initialized
+[ -f "$ENTRYPOINT_DATA_INIT_FILE" ] && DATA_DIR_INITIALIZED="yes" || DATA_DIR_INITIALIZED="no"
+[ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ] && CONFIG_DIR_INITIALIZED="yes" || CONFIG_DIR_INITIALIZED="no"
+{ [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; } && ENTRYPOINT_FIRST_RUN="no" || ENTRYPOINT_FIRST_RUN="yes"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# clean ENV_PORTS variables
+ENV_PORTS="${ENV_PORTS//,/ }"  #
+ENV_PORTS="${ENV_PORTS//\/*/}" #
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# clean SERVER_PORTS variables
+SERVER_PORTS="${SERVER_PORTS//,/ }"  #
+SERVER_PORTS="${SERVER_PORTS//\/*/}" #
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# clean WEB_SERVER_PORTS variables
+WEB_SERVER_PORTS="${WEB_SERVER_PORT//\/*/}"                             #
+WEB_SERVER_PORTS="${WEB_SERVER_PORTS//\/*/}"                            #
+WEB_SERVER_PORTS="${WEB_SERVER_PORT//,/ } ${ENV_WEB_SERVER_PORTS//,/ }" #
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# rewrite and merge variables
+ENV_PORTS="$(__format_variables "$ENV_PORTS" || false)"
+WEB_SERVER_PORTS="$(__format_variables "$WEB_SERVER_PORTS" || false)"
+ENV_PORTS="$(__format_variables "$SERVER_PORTS" "$WEB_SERVER_PORTS" "$ENV_PORTS" "$SERVER_PORTS" || false)"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+#
+HEALTH_ENDPOINTS="${HEALTH_ENDPOINTS//,/ }"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # create required directories
 mkdir -p "/run"
 mkdir -p "/tmp"
 mkdir -p "/root"
+mkdir -p "/var/run"
+mkdir -p "/var/tmp"
+mkdir -p "/run/cron"
 mkdir -p "/data/logs"
 mkdir -p "/run/init.d"
+mkdir -p "/config/enable"
 mkdir -p "/config/secure"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # create required files
@@ -124,234 +191,193 @@ touch "/data/logs/entrypoint.log"
 chmod -f 777 "/run"
 chmod -f 777 "/tmp"
 chmod -f 700 "/root"
+chmod -f 777 "/var/run"
+chmod -f 777 "/var/tmp"
+chmod -f 777 "/run/cron"
 chmod -f 777 "/data/logs"
 chmod -f 777 "/run/init.d"
+chmod -f 666 "/dev/stderr"
+chmod -f 666 "/dev/stdout"
+chmod -f 777 "/config/enable"
 chmod -f 777 "/config/secure"
 chmod -f 777 "/data/logs/entrypoint.log"
-chmod -f 777 "/dev/stderr" "/dev/stdout"
-################## END OF CONFIGURATION #####################
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+[ -f "/dev/stdin" ] && chmod -f 777 "/dev/stdin"
+[ -f "/dev/stderr" ] && chmod -f 777 "/dev/stderr"
+[ -f "/dev/stdout" ] && chmod -f 777 "/dev/stdout"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+cat <<EOF | tee /etc/profile.d/locales.shadow /etc/profile.d/locales.sh >/dev/null
+export LANG="\${LANG:-C.UTF-8}"
+export LC_ALL="\${LANG:-C.UTF-8}"
+export TZ="\${TZ:-\${TIMEZONE:-America/New_York}}"
+EOF
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Create the backup dir
-[ -n "$BACKUP_DIR" ] && [ -d "$BACKUP_DIR" ] || mkdir -p "$BACKUP_DIR"
+[ -n "$BACKUP_DIR" ] && { [ -d "$BACKUP_DIR" ] || mkdir -p "$BACKUP_DIR"; }
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
+  # Show start message
+  if [ "$CONFIG_DIR_INITIALIZED" = "no" ] || [ "$DATA_DIR_INITIALIZED" = "no" ]; then
+    [ "$ENTRYPOINT_MESSAGE" = "yes" ] && echo "Executing entrypoint script for buildah"
+  fi
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # Set reusable variables
+  { { [ -w "/etc" ] && [ ! -e "/etc/hosts" ]; } || [ -w "/etc/hosts" ]; } && UPDATE_FILE_HOSTS="yes"
+  { { [ -w "/etc" ] && [ ! -e "/etc/timezone" ]; } || [ -w "/etc/timezone" ]; } && UPDATE_FILE_TZ="yes"
+  { { [ -w "/etc" ] && [ ! -e "/etc/resolv.conf" ]; } || [ -w "/etc/resolv.conf" ]; } && UPDATE_FILE_RESOLV="yes"
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # Set timezone
+  [ -n "$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && echo "$TZ" >"/etc/timezone"
+  [ -f "/usr/share/zoneinfo/$TZ" ] && [ "$UPDATE_FILE_TZ" = "yes" ] && ln -sf "/usr/share/zoneinfo/$TZ" "/etc/localtime"
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # if ipv6 add it to /etc/hosts
+  if [ "$UPDATE_FILE_HOSTS" = "yes" ]; then
+    echo "# known hostname mappings" >"/etc/hosts"
+    if [ -n "$(ip a 2>/dev/null | grep 'inet6.*::' || ifconfig 2>/dev/null | grep 'inet6.*::')" ]; then
+      __printf_space "40" "::1" "localhost" >>"/etc/hosts"
+      __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts"
+    else
+      __printf_space "40" "127.0.0.1" "localhost" >>"/etc/hosts"
+    fi
+  fi
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # add .home domain
+  if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ -n "$HOSTNAME" ]; then
+    __grep_test " $HOSTNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "$HOSTNAME" >>"/etc/hosts"
+    __grep_test " ${HOSTNAME%%.*}.home" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.home" >>"/etc/hosts"
+  fi
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # add domainname
+  if [ "$UPDATE_FILE_HOSTS" = "yes" ] && [ "$DOMAINNAME" != "home" ] && [ -n "$DOMAINNAME" ] && [ "$HOSTNAME.$DOMAINNAME" != "$DOMAINNAME" ]; then
+    __grep_test " ${HOSTNAME%%.*}.$DOMAINNAME" "/etc/hosts" || __printf_space "40" "${CONTAINER_IP4_ADDRESS:-127.0.0.1}" "${HOSTNAME%%.*}.$DOMAINNAME" >>"/etc/hosts"
+  fi
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # Set containers hostname
+  [ -n "$HOSTNAME" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && echo "$HOSTNAME" >"/etc/hostname"
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # Set containers hostname with domain
+  # [ -n "$DOMAINNAME" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && echo "$HOSTNAME.$DOMAINNAME" >"/etc/hostname"
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  if [ -f "/etc/hostname" ]; then
+    [ -n "$(type -P hostname)" ] && hostname -F "/etc/hostname" &>/dev/null || HOSTNAME="$(<"/etc/hostname")"
+    export HOSTNAME
+  fi
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # import hosts file into container
+  [ -f "/usr/local/etc/hosts" ] && [ "$UPDATE_FILE_HOSTS" = "yes" ] && cat "/usr/local/etc/hosts" | grep -vF "$HOSTNAME" >>"/etc/hosts"
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  # import resolv.conf file into container
+  [ "$CUSTOM_DNS" != "yes" ] && [ -f "/usr/local/etc/resolv.conf" ] && [ "$UPDATE_FILE_RESOLV" = "yes" ] && cat "/usr/local/etc/resolv.conf" >"/etc/resolv.conf"
+  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  if [ -d "/usr/local/etc/skel" ]; then
+    cp -Rf "/usr/local/etc/skel/." "$HOME/"
+  fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Show start message
-if [ "$CONFIG_DIR_INITIALIZED" = "false" ] || [ "$DATA_DIR_INITIALIZED" = "false" ]; then
-  [ "$ENTRYPOINT_MESSAGE" = "yes" ] && echo "Executing entrypoint script for buildah"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Set timezone
-[ -n "$TZ" ] && [ -w "/etc/timezone" ] && echo "$TZ" >"/etc/timezone"
-[ -f "/usr/share/zoneinfo/$TZ" ] && [ -w "/etc/localtime" ] && ln -sf "/usr/share/zoneinfo/$TZ" "/etc/localtime"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Make sure localhost exists
-if [ -w "/etc/hosts" ] && ! grep -q '127.0.0.1' /etc/hosts; then
-  echo "127.0.0.1       localhost" >"/etc/hosts"
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Set containers hostname
-[ -n "$HOSTNAME" ] && [ -w "/etc/timezone" ] && echo "$HOSTNAME" >"/etc/hostname"
-if [ -w "/etc/hosts" ] && [ -n "$HOSTNAME" ]; then
-  echo "${CONTAINER_IP4_ADDRESS:-127.0.0.1}    $HOSTNAME $HOSTNAME.local" >>"/etc/hosts"
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Add domain to hosts file
-[ -n "$DOMAINNAME" ] && [ -w "/etc/timezone" ] && echo "$HOSTNAME.${DOMAINNAME:-local}" >"/etc/hostname"
-if [ -w "/etc/hosts" ] && [ -n "$DOMAINNAME" ]; then
-  echo "${CONTAINER_IP4_ADDRESS:-127.0.0.1}    $HOSTNAME.${DOMAINNAME:-local}" >"/etc/hosts"
-  echo "${CONTAINER_IP4_ADDRESS:-127.0.0.1}    $HOSTNAME.$DOMAINNAME" >>"/etc/hosts"
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Delete any gitkeep files
+# Delete any .gitkeep files
 [ -d "/data" ] && rm -Rf "/data/.gitkeep" "/data"/*/*.gitkeep
 [ -d "/config" ] && rm -Rf "/config/.gitkeep" "/config"/*/*.gitkeep
 [ -f "/usr/local/bin/.gitkeep" ] && rm -Rf "/usr/local/bin/.gitkeep"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# import hosts file into container
-[ -f "/usr/local/etc/hosts" ] && [ -w "/etc/hosts" ] && cat "/usr/local/etc/hosts" >>"/etc/hosts"
+# Setup bin directory - /config/bin > /usr/local/bin
+__initialize_custom_bin_dir
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Setup bin directory
-SET_USR_BIN=""
-[ -d "/data/bin" ] && SET_USR_BIN+="$(__find /data/bin f) "
-[ -d "/config/bin" ] && SET_USR_BIN+="$(__find /config/bin f) "
-if [ -n "$SET_USR_BIN" ]; then
-  echo "Setting up bin $SET_USR_BIN > $LOCAL_BIN_DIR"
-  for create_bin_template in $SET_USR_BIN; do
-    if [ -n "$create_bin_template" ]; then
-      create_bin_name="$(basename "$create_bin_template")"
-      if [ -e "$create_bin_template" ]; then
-        ln -sf "$create_bin_template" "$LOCAL_BIN_DIR/$create_bin_name"
-      fi
-    fi
-  done
-  unset create_bin_template create_bin_name SET_USR_BIN
-fi
+# Copy default system configs - /usr/local/share/template-files/defaults > /config/
+__initialize_default_templates
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Copy default config
-if [ -n "$DEFAULT_TEMPLATE_DIR" ]; then
-  if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -d "/config" ]; then
-    echo "Copying default config files $DEFAULT_TEMPLATE_DIR > /config"
-    for create_config_template in "$DEFAULT_TEMPLATE_DIR"/*; do
-      if [ -n "$create_config_template" ]; then
-        create_template_name="$(basename "$create_config_template")"
-        if [ -d "$create_config_template" ]; then
-          mkdir -p "/config/$create_template_name/"
-          __is_dir_empty "/config/$create_template_name" || cp -Rf "$create_config_template/." "/config/$create_template_name/" 2>/dev/null
-        elif [ -e "$create_config_template" ]; then
-          [ -e "/config/$create_template_name" ] || cp -Rf "$create_config_template" "/config/$create_template_name" 2>/dev/null
-        fi
-      fi
-    done
-    unset create_config_template create_template_name
-  fi
-fi
+# Copy custom config files - /usr/local/share/template-files/config > /config/
+__initialize_config_dir
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Copy custom config files
-if [ -n "$DEFAULT_CONF_DIR" ]; then
-  if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -d "/config" ]; then
-    echo "Copying custom config files: $DEFAULT_CONF_DIR > /config"
-    for create_config_template in "$DEFAULT_CONF_DIR"/*; do
-      create_config_name="$(basename "$create_config_template")"
-      if [ -n "$create_config_template" ]; then
-        if [ -d "$create_config_template" ]; then
-          mkdir -p "/config/$create_config_name"
-          __is_dir_empty "/config/$create_config_name" || cp -Rf "$create_config_template/." "/config/$create_config_name/" 2>/dev/null
-        elif [ -e "$create_config_template" ]; then
-          [ -e "/config/$create_config_name" ] || cp -Rf "$create_config_template" "/config/$create_config_name" 2>/dev/null
-        fi
-      fi
-    done
-    unset create_config_template create_config_name
-  fi
-fi
+# Copy custom data files - /usr/local/share/template-files/data > /data/
+__initialize_data_dir
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Copy custom data files
-if [ -d "/data" ]; then
-  if [ "$DATA_DIR_INITIALIZED" = "false" ] && [ -n "$DEFAULT_DATA_DIR" ]; then
-    echo "Copying data files $DEFAULT_DATA_DIR > /data"
-    for create_data_template in "$DEFAULT_DATA_DIR"/*; do
-      create_data_name="$(basename "$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_template
-  fi
-fi
+__initialize_ssl_certs
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Copy /config to /etc
-if [ -d "/config" ]; then
-  if [ "$CONFIG_DIR_INITIALIZED" = "false" ]; then
-    echo "Copy config files to system: /config > /etc"
-    for create_config_name in /config/*; do
-      if [ -n "$create_config_name" ]; then
-        create_conf_name="$(basename "$create_config_name")"
-        if [ -d "/etc/$create_conf_name" ] && [ -d "$create_config_name" ]; then
-          mkdir -p "/etc/$create_conf_name/"
-          cp -Rf "$create_config_name/." "/etc/$create_conf_name/" 2>/dev/null
-        elif [ -e "/etc/$create_conf_name" ] && [ -e "$create_config_name" ]; then
-          cp -Rf "$create_config_name" "/etc/$create_conf_name" 2>/dev/null
-        fi
-      fi
-    done
-    unset create_config_name create_conf_name
-  fi
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Copy html files
-if [ "$DATA_DIR_INITIALIZED" = "false" ] && [ -n "$WWW_ROOT_DIR" ]; then
-  if [ -d "$DEFAULT_DATA_DIR/data/htdocs" ]; then
-    __is_dir_empty "$WWW_ROOT_DIR/" || cp -Rf "$DEFAULT_DATA_DIR/data/htdocs/." "$WWW_ROOT_DIR/" 2>/dev/null
-  fi
-fi
-if [ -n "$WWW_ROOT_DIR" ]; then
-  if [ -d "$DEFAULT_DATA_DIR/htdocs/www" ] && [ ! -d "$WWW_ROOT_DIR" ]; then
-    mkdir -p "$WWW_ROOT_DIR"
-    cp -Rf "$DEFAULT_DATA_DIR/htdocs/www/" "$WWW_ROOT_DIR"
-    [ -f "$WWW_ROOT_DIR/htdocs/www/health/index.txt" ] || echo "OK" >"$WWW_ROOT_DIR/htdocs/www/health/index.txt"
-  fi
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-[ -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
-  fi
-  type update-ca-certificates &>/dev/null && update-ca-certificates
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# setup the smtp server
-__setup_mta
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-__run_pre
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-if [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ]; then
+if [ -f "$ENTRYPOINT_PID_FILE" ] || [ -f "$ENTRYPOINT_INIT_FILE" ]; then
+  START_SERVICES="no"
+  ENTRYPOINT_MESSAGE="no"
   ENTRYPOINT_FIRST_RUN="no"
+  touch "$ENTRYPOINT_PID_FILE"
 elif [ -d "/config" ]; then
-  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_CONFIG_INIT_FILE"
+  echo "$$" >"$ENTRYPOINT_PID_FILE"
+  echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_INIT_FILE"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Check if this is a new container
 if [ -f "$ENTRYPOINT_DATA_INIT_FILE" ]; then
-  DATA_DIR_INITIALIZED="true"
+  DATA_DIR_INITIALIZED="yes"
 elif [ -d "/data" ]; then
   echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_DATA_INIT_FILE"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ -f "$ENTRYPOINT_CONFIG_INIT_FILE" ]; then
-  CONFIG_DIR_INITIALIZED="true"
+  CONFIG_DIR_INITIALIZED="yes"
 elif [ -d "/config" ]; then
   echo "Initialized on: $INIT_DATE" >"$ENTRYPOINT_CONFIG_INIT_FILE"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-if [ -f "$ENTRYPOINT_PID_FILE" ]; then
-  START_SERVICES="no"
-  ENTRYPOINT_MESSAGE="no"
+if [ "$ENTRYPOINT_FIRST_RUN" != "no" ]; then
+  # setup the smtp server
+  __setup_mta
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-[ "$ENTRYPOINT_MESSAGE" = "yes" ] && echo "Container ip address is: $CONTAINER_IP4_ADDRESS"
+# if no pid assume container restart
+[ -f "$ENTRYPOINT_PID_FILE" ] && [ -f "/run/__start_init_scripts.pid" ] || START_SERVICES="yes"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+[ "$ENTRYPOINT_MESSAGE" = "yes" ] && __printf_space "40" "Container ip address is:" "$CONTAINER_IP4_ADDRESS"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Show configured listing processes
-if [ -n "$ENV_PORTS" ]; then
+if [ "$ENTRYPOINT_MESSAGE" = "yes" ] && [ -n "$ENV_PORTS" ]; then
   show_port=""
-  for port in $ENV_PORTS; do [ -n "$port" ] && show_port+="$(printf '%s ' "$port") "; done
-  printf '%s\n' "The following ports are open: $show_port"
+  for port in $ENV_PORTS; do [ -n "$port" ] && show_port+="$(printf '%s ' "${port// /}") "; done
+  __printf_space "40" "The following ports are open:" "$show_port"
   unset port show_port
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# execute init script
+if [ -f "/tmp/init" ]; then sh "/tmp/init"; fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Show message
 __run_message
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Just start services
 START_SERVICES="${START_SERVICES:-SYSTEM_INIT}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Start all services if no pidfile
+if [ "$START_SERVICES" = "yes" ] && [ "$1" != "backup" ] && [ "$1" != "healthcheck" ]; then
+  [ "$1" = "start" ] && shift 1
+  [ "$1" = "all" ] && shift 1
+  [ "$1" = "init" ] && export CONTAINER_INIT="yes"
+  echo "$$" >"/run/init.d/entrypoint.pid"
+  __start_init_scripts "/usr/local/etc/docker/init.d"
+  START_SERVICES="no"
+  CONTAINER_INIT="no"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Begin options
 case "$1" in
---help) # Help message
+# Help message
+--help)
   echo 'Docker container for '$APPNAME''
   echo "Usage: $APPNAME [cron exec start init shell certbot ssl procs ports healthcheck backup command]"
   echo ""
   exit 0
   ;;
 
+init)
+  shift 1
+  echo "Container has been Initialized"
+  exit 0
+  ;;
+
 cron)
   shift 1
   __cron "$@" &
+  exit
   ;;
-
-backup) # backup data and config dirs
+# backup data and config dirs
+backup)
   shift 1
   save="${1:-$BACKUP_DIR}"
   backupExit=0
@@ -359,13 +385,13 @@ backup) # backup data and config dirs
   file="$save/$date.tar.gz"
   echo "Backing up /data /config to $file"
   sleep 1
-  tar cfvz "$file" --exclude="$save" "/data" "/config" || backupExit=1
+  tar cfvz "$file" --exclude="$save" "/data" "/config" || false
   backupExit=$?
   [ $backupExit -eq 0 ] && echo "Backed up /data /config has finished" || echo "Backup of /data /config has failed"
   exit $backupExit
   ;;
-
-healthcheck) # Docker healthcheck
+# Docker healthcheck
+healthcheck)
   healthStatus=0
   services="${SERVICES_LIST:-$@}"
   healthEnabled="${HEALTH_ENABLED:-}"
@@ -378,48 +404,54 @@ healthcheck) # Docker healthcheck
     if [ -n "$proc" ]; then
       if ! __pgrep "$proc"; then
         echo "$proc is not running" >&2
-        status=$((status + 1))
+        healthStatus=$((healthStatus + 1))
       fi
     fi
   done
   for port in $ports; do
     if [ -n "$(type -P netstat)" ] && [ -n "$port" ]; then
-      netstat -taupln | grep -q ":$port " || healthStatus=$((healthStatus + 1))
+      if ! netstat -taupln | grep -q ":$port "; then
+        echo "$port isn't open" >&2
+        healthStatus=$((healthStatus + 1))
+      fi
     fi
   done
   for endpoint in $healthEndPoints; do
     if [ -n "$endpoint" ]; then
-      __curl "$endpoint" || healthStatus=$((healthStatus + 1))
+      if ! __curl "$endpoint"; then
+        echo "Can not connect to $endpoint" >&2
+        healthStatus=$((healthStatus + 1))
+      fi
     fi
   done
   [ "$healthStatus" -eq 0 ] || healthMessage="Errors reported see: docker logs --follow $CONTAINER_NAME"
   [ -n "$healthMessage" ] && echo "$healthMessage"
   exit $healthStatus
   ;;
-
-ports) # show open ports
+  # show open ports
+ports)
   shift 1
   ports="$(__netstat -taupln | awk -F ' ' '{print $4}' | awk -F ':' '{print $2}' | sort --unique --version-sort | grep -v '^$' | grep '^' || echo '')"
   [ -n "$ports" ] && printf '%s\n%s\n' "The following are servers:" "$ports" | tr '\n' ' '
   exit $?
   ;;
-
-procs) # show running processes
+  # show running processes
+procs)
   shift 1
   ps="$(__ps axco command | grep -vE 'COMMAND|grep|ps' | sort -u || grep '^' || echo '')"
   [ -n "$ps" ] && printf '%s\n%s\n' "Found the following processes" "$ps" | tr '\n' ' '
   exit $?
   ;;
-
-ssl) # setup ssl
+  # setup ssl
+ssl)
   shift 1
   __create_ssl_cert
   exit $?
   ;;
-
-certbot) # manage ssl certificate
+# manage ssl certificate
+certbot)
   shift 1
-  SSL_CERT_BOT="true"
+  CERT_BOT_ENABLED="yes"
   if [ "$1" = "create" ]; then
     shift 1
     __certbot "create"
@@ -431,37 +463,51 @@ certbot) # manage ssl certificate
   fi
   exit $?
   ;;
-
-*/bin/sh | */bin/bash | bash | sh | shell) # Launch shell
+# Launch shell
+*/bin/sh | */bin/bash | bash | sh | shell)
   shift 1
-  __exec_command "${@:-/bin/bash}"
+  __exec_command "${@:-/bin/bash -l}"
   exit $?
   ;;
-
-start) # show/start an init script
+# execute commands
+exec)
   shift 1
-  PATH="/usr/local/etc/docker/init.d:$PATH"
+  __exec_command "${@:-echo "No commands given"}"
+  exit $?
+  ;;
+# show/start init scripts
+start)
+  shift 1
+  export PATH="/usr/local/etc/docker/init.d:$PATH"
   if [ $# -eq 0 ]; then
     scripts="$(ls -A "/usr/local/etc/docker/init.d")"
     [ -n "$scripts" ] && echo "$scripts" || echo "No scripts found in: /usr/local/etc/docker/init.d"
-  elif [ -f "/usr/local/etc/docker/init.d/$1" ]; then
-    eval "/usr/local/etc/docker/init.d/$1"
+    exit
   elif [ "$1" = "all" ]; then
     shift $#
-    echo "$$" >"/run/init.d/entrypoint.pid"
-    __start_init_scripts "/usr/local/etc/docker/init.d"
-  fi
-  __no_exit
-  ;;
+    if [ "$START_SERVICES" = "yes" ]; then
+      echo "$$" >"/run/init.d/entrypoint.pid"
+      __start_init_scripts "/usr/local/etc/docker/init.d"
+      __no_exit
+    elif [ -f "/usr/local/etc/docker/init.d/$1" ]; then
+      eval "/usr/local/etc/docker/init.d/$1" &
+      __no_exit
 
-*) # Execute primary command
-  if [ "$START_SERVICES" = "yes" ] || [ ! -f "/run/init.d/entrypoint.pid" ]; then
-    echo "$$" >"/run/init.d/entrypoint.pid"
-    __start_init_scripts "/usr/local/etc/docker/init.d"
+    fi
+  fi
+  ;;
+# Execute primary command
+*)
+  if [ $# -eq 0 ]; then
+    if [ ! -f "/run/init.d/entrypoint.pid" ]; then
+      echo "$$" >"/run/init.d/entrypoint.pid"
+      __start_init_scripts "/usr/local/etc/docker/init.d"
+    fi
     __no_exit
   else
     __exec_command "$@"
   fi
+  exit $?
   ;;
 esac
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/rootfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh
index 935049a..21b90ca 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           :  202309030111-git
+##@Version           :  202407241259-git
 # @@Author           :  Jason Hempstead
 # @@Contact          :  git-admin@casjaysdev.pro
 # @@License          :  LICENSE.md
@@ -25,10 +25,22 @@
 # shellcheck disable=SC2199
 # shellcheck disable=SC2317
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Set bash options
-[ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -o pipefail -x$DEBUGGER_OPTIONS || set -o pipefail
+# setup debugging - https://www.gnu.org/software/bash/manual/html_node/The-Set-Builtin.html
+[ -f "/config/.debug" ] && [ -z "$DEBUGGER_OPTIONS" ] && export DEBUGGER_OPTIONS="$(<"/config/.debug")" || DEBUGGER_OPTIONS="${DEBUGGER_OPTIONS:-}"
+{ [ "$DEBUGGER" = "on" ] || [ -f "/config/.debug" ]; } && echo "Enabling debugging" && set -xo pipefail -x$DEBUGGER_OPTIONS && export DEBUGGER="on" || set -o pipefail
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-__printf_space() { printf "%-${1:-30}s%s\n" "${2}" "${3}"; }
+__remove_extra_spaces() { sed 's/\( \)*/\1/g;s|^ ||g'; }
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__printf_space() {
+  pad=$(printf '%0.1s' " "{1..60})
+  padlength=$1
+  string1="$2"
+  string2="$3"
+  printf '%s' "$string1"
+  printf '%*.*s' 0 $((padlength - ${#string1} - ${#string2})) "$pad"
+  printf '%s\n' "$string2"
+  string2=${string2:1}
+}
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __cd() { [ -d "$1" ] && builtin cd "$1" || return 1; }
 __rm() { [ -n "$1" ] && [ -e "$1" ] && rm -Rf "${1:?}"; }
@@ -37,17 +49,21 @@ __netstat() { [ -f "$(type -P netstat)" ] && netstat "$@" || return 10; }
 __is_in_file() { [ -e "$2" ] && grep -Rsq "$1" "$2" && return 0 || return 1; }
 __curl() { curl -q -sfI --max-time 3 -k -o /dev/null "$@" &>/dev/null || return 10; }
 __find() { find "$1" -mindepth 1 -type ${2:-f,d} 2>/dev/null | grep '^' || return 10; }
-__is_dir_empty() { [ "$(ls -A "$1" 2>/dev/null | wc -l)" -eq 0 ] && return 0 || return 1; }
 __pcheck() { [ -n "$(which pgrep 2>/dev/null)" ] && pgrep -o "$1" &>/dev/null || return 10; }
 __file_exists_with_content() { [ -n "$1" ] && [ -f "$1" ] && [ -s "$1" ] && return 0 || return 2; }
 __sed() { sed -i 's|'$1'|'$2'|g' "$3" &>/dev/null || sed -i "s|$1|$2|g" "$3" &>/dev/null || return 1; }
 __ps() { [ -f "$(type -P ps)" ] && ps "$@" 2>/dev/null | grep -Fw " ${1:-$SERVICE_NAME}" || return 10; }
 __pgrep() { __pcheck "${1:-SERVICE_NAME}" || __ps "${1:-$SERVICE_NAME}" | grep -qv ' grep' || return 10; }
+__is_dir_empty() { if [ -n "$1" ]; then [ "$(ls -A "$1" 2>/dev/null | wc -l)" -eq 0 ] && return 0 || return 1; else return 1; fi; }
 __get_ip6() { ip a 2>/dev/null | grep -w 'inet6' | awk '{print $2}' | grep -vE '^::1|^fe' | sed 's|/.*||g' | head -n1 | grep '^' || echo ''; }
 __get_ip4() { ip a 2>/dev/null | grep -w 'inet' | awk '{print $2}' | grep -vE '^127.0.0' | sed 's|/.*||g' | head -n1 | grep '^' || echo '127.0.0.1'; }
 __find_file_relative() { find "$1"/* -not -path '*env/*' -not -path '.git*' -type f 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '^' || false; }
 __find_directory_relative() { find "$1"/* -not -path '*env/*' -not -path '.git*' -type d 2>/dev/null | sed 's|'$1'/||g' | sort -u | grep -v '^$' | grep '^' || false; }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__pid_exists() { ps -ax --no-header | sed 's/^[[:space:]]*//g' | awk -F' ' '{print $1}' | grep '[0-9]' | sort -uV | grep "^$1$" && return 0 || return 1; }
+__is_running() { ps -eo args --no-header | awk '{print $1,$2,$3}' | sed 's|:||g' | sort -u | grep -vE 'grep|COMMAND|awk|tee|ps|sed|sort|tail' | grep "$1" | grep -q "${2:-^}" && return 0 || return 1; }
+__get_pid() { ps -ax --no-header | sed 's/^[[:space:]]*//g;s|;||g;s|:||g' | awk '{print $1,$5}' | grep -v 'grep' | grep "$1$" | awk -F' ' '{print $1}' | grep '[0-9]' | sort -uV | head -n1 | grep '^' && return 0 || return 1; }
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __format_variables() { printf '%s\n' "${@//,/ }" | tr ' ' '\n' | sort -RVu | grep -v '^$' | tr '\n' ' ' | __clean_variables | grep '^' || return 3; }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __clean_variables() {
@@ -59,10 +75,18 @@ __clean_variables() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __no_exit() {
-  [ -f "/run/no_exit.pid" ] && return
-  exec /bin/sh -c "trap 'sleep 1;rm -Rf /run/no_exit.pid;exit 0' TERM INT;(while true; do echo $!>/run/no_exit.pid;tail -qf /data/logs/entrypoint.log /data/logs/*/*log 2>/dev/null||sleep 20; done) & wait"
+  [ -f "/run/no_exit.pid" ] || exec /bin/sh -c "trap 'sleep 1;rm -Rf /run/no_exit.pid;exit 0' TERM INT;(while true; do echo $$ >/run/no_exit.pid;tail -qf /data/logs/entrypoint.log /data/logs/*/*log 2>/dev/null||sleep 20; done) & wait"
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__trim() {
+  local var="${*//;/ }"
+  var="${var#"${var%%[![:space:]]*}"}" # remove leading whitespace characters
+  var="${var%"${var##*[![:space:]]}"}" # remove trailing whitespace characters
+  var="$(echo "$var" | __remove_extra_spaces | sed "s| |; |g;s|;$| |g" | __remove_extra_spaces)"
+  printf '%s' "$var" | sed 's|;||g' | grep -v '^$'
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__banner() { printf '# - - - %-60s  - - - #\n' "$*"; }
 __find_php_bin() { find -L '/usr'/*bin -maxdepth 4 -name 'php-fpm*' 2>/dev/null | head -n1 | grep '^' || echo ''; }
 __find_php_ini() { find -L '/etc' -maxdepth 4 -name 'php.ini' 2>/dev/null | head -n1 | sed 's|/php.ini||g' | grep '^' || echo ''; }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -99,34 +123,44 @@ __certbot() {
   local statusCode=0
   CERTBOT_DOMAINS="${CERTBOT_DOMAINS:-$HOSTNAME}"
   [ -n "$(type -P 'certbot')" ] || return 1
-  if [ -f "/config/certbot/env.sh" ]; then
-    . "/config/certbot/env.sh"
-  fi
+  [ -f "/config/certbot/env.sh" ] && . "/config/certbot/env.sh"
   if [ -f "/config/certbot/setup.sh" ]; then
     eval "/config/certbot/setup.sh"
     statusCode=$?
   elif [ -f "/etc/named/certbot.sh" ]; then
     eval "/etc/named/certbot.sh"
     statusCode=$?
+  elif [ -f "/config/certbot/certbot.conf" ]; then
+    if certbot renew -n --dry-run --agree-tos --expand --dns-rfc2136 --dns-rfc2136-credentials /config/certbot/certbot.conf; then
+      certbot renew -n --agree-tos --expand --dns-rfc2136 --dns-rfc2136-credentials /config/certbot/certbot.conf
+    fi
+    statusCode=$?
   elif [ -f "/config/named/certbot-update.conf" ]; then
     if certbot renew -n --dry-run --agree-tos --expand --dns-rfc2136 --dns-rfc2136-credentials /config/named/certbot-update.conf; then
       certbot renew -n --agree-tos --expand --dns-rfc2136 --dns-rfc2136-credentials /config/named/certbot-update.conf
     fi
     statusCode=$?
   else
+    [ -n "$SSL_KEY" ] && mkdir -p "$(dirname "$SSL_KEY")" || { echo "The variable $SSL_KEY is not set" >&2 && return 1; }
+    [ -n "$SSL_CERT" ] && mkdir -p "$(dirname "$SSL_CERT")" || { echo "The variable $SSL_CERT is not set" >&2 && return 1; }
     local options="${1:-create}" && shift 1
     domain_list="$DOMAINNAME www.$DOMAINNAME mail.$DOMAINNAME $CERTBOT_DOMAINS"
     [ -f "/config/env/ssl.sh" ] && . "/config/env/ssl.sh"
     [ "$CERT_BOT_ENABLED" = "true" ] || { export CERT_BOT_ENABLED="" && return 10; }
-    [ -n "$CERT_BOT_MAIL" ] || echo "The variable CERT_BOT_MAIL is not set" && return 1
-    [ -n "$DOMAINNAME" ] || echo "The variable DOMAINNAME is not set" && return 1
+    [ -n "$DOMAINNAME" ] || { echo "The variable DOMAINNAME is not set" >&2 && return 1; }
+    [ -n "$CERT_BOT_MAIL" ] || { echo "The variable CERT_BOT_MAIL is not set" >&2 && return 1; }
     for domain in $$CERTBOT_DOMAINS; do
-      [ -n "$domain" ] && ADD_CERTBOT_DOMAINS="-d $domain "
+      [ -n "$domain" ] && ADD_CERTBOT_DOMAINS="-d $domain $ADD_CERTBOT_DOMAINS"
     done
-    certbot $options --agree-tos -m $CERT_BOT_MAIL certonly --webroot \
-      -w "${WWW_ROOT_DIR:-/usr/share/httpd/default}" $ADD_CERTBOT_DOMAINS \
-      --key-path "$SSL_KEY" --fullchain-path "$SSL_CERT"
-    statusCode=$?
+    if [ -n "$ADD_CERTBOT_DOMAINS" ]; then
+      certbot $options --agree-tos -m $CERT_BOT_MAIL certonly \
+        --webroot "${WWW_ROOT_DIR:-/usr/share/httpd/default}" \
+        --key-path "$SSL_KEY" --fullchain-path "$SSL_CERT" \
+        $ADD_CERTBOT_DOMAINS
+      statusCode=$?
+    else
+      statusCode=1
+    fi
   fi
   [ $statusCode -eq 0 ] && __update_ssl_certs
   return $statusCode
@@ -174,12 +208,10 @@ __init_apache() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __init_nginx() {
-  local etc_dir="" conf_dir="" www_dir="" nginx_bin=""
-  etc_dir="/etc/${1:-nginx}"
-  conf_dir="/config/${1:-nginx}"
-  www_dir="${WWW_ROOT_DIR:-/data/htdocs}"
-  nginx_bin="$(type -P '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')"
   return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -187,21 +219,18 @@ __init_php() {
   local etc_dir="/etc/${1:-php}"
   local conf_dir="/config/${1:-php}"
   local php_bin="${PHP_BIN_DIR:-$(__find_php_bin)}"
-  #
   return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __init_mysql() {
-  local db_dir="" etc_dir="" db_user="" conf_dir="" user_pass="" user_db="" root_pass="" mysqld_bin=""
-  db_dir="/data/db/mysql"
-  etc_dir="${home:-/etc/${1:-mysql}}"
-  db_user="${SERVICE_USER:-mysql}"
-  conf_dir="/config/${1:-mysql}"
-  user_pass="${MARIADB_PASSWORD:-$MARIADB_ROOT_PASSWORD}"
-  user_db="${MARIADB_DATABASE}" user_name="${MARIADB_USER:-root}"
-  root_pass="$MARIADB_ROOT_PASSWORD"
-  mysqld_bin="$(type -P 'mysqld')"
-  #
+  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_pass="${MARIADB_PASSWORD:-$MARIADB_ROOT_PASSWORD}"
+  local user_db="${MARIADB_DATABASE}" user_name="${MARIADB_USER:-root}"
+  local root_pass="$MARIADB_ROOT_PASSWORD"
+  local mysqld_bin="$(type -P 'mysqld')"
   return 0
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -209,7 +238,6 @@ __init_mongodb() {
   local home="${MONGODB_CONFIG_FILE:-$(__find_mongodb_conf)}"
   local user_pass="${MONGO_INITDB_ROOT_PASSWORD:-$_ROOT_PASSWORD}"
   local user_name="${INITDB_ROOT_USERNAME:-root}"
-  #
   return
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -217,7 +245,6 @@ __init_postgres() {
   local home="${PGSQL_CONFIG_FILE:-$(__find_pgsql_conf)}"
   local user_pass="${POSTGRES_PASSWORD:-$POSTGRES_ROOT_PASSWORD}"
   local user_name="${POSTGRES_USER:-root}"
-  #
   return
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -225,7 +252,6 @@ __init_couchdb() {
   local home="${COUCHDB_CONFIG_FILE:-$(__find_couchdb_conf)}"
   local user_pass="${COUCHDB_PASSWORD:-$SET_RANDOM_PASS}"
   local user_name="${COUCHDB_USER:-root}"
-  #
   return
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -252,8 +278,8 @@ __cron() {
   trap '[ -f "/run/cron/$cmd" ] && rm -Rf "/run/cron/$cmd";exit 0' SIGINT ERR EXIT
   test -n "$1" && test -z "${1//[0-9]/}" && interval=$(($1 * 60)) && shift 1 || interval="5"
   [ $# -eq 0 ] && echo "Usage: cron [interval] [command]" && exit 1
-  command="$*"
-  cmd="${CRON_NAME:-$(echo "$command" | awk -F' ' '{print $1}')}"
+  local command="$*"
+  local cmd="${CRON_NAME:-$(echo "$command" | awk -F' ' '{print $1}')}"
   [ -d "/run/cron" ] || mkdir -p "/run/cron"
   echo "$command" >"/run/cron/$cmd"
   while :; do
@@ -272,7 +298,7 @@ __replace() {
 __find_replace() {
   local search="$1" replace="$2" file="${3:-$2}"
   [ -e "$file" ] || return 1
-  find "$file" -type f -not -path '.git*' -exec sed -i "s|$search|$replace|g" {} \;
+  find "$file" -type f -not -path '.git*' -exec sed -i "s|$search|$replace|g" {} \; 2>/dev/null
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # /config > /etc
@@ -293,22 +319,23 @@ __symlink() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __file_copy() {
-  local from="$1" to="$2"
-  if [ -n "$from" ] && [ -e "$from" ] && [ -n "$to" ]; then
+  local from="$1"
+  local dest="$2"
+  if [ -n "$from" ] && [ -e "$from" ] && [ -n "$dest" ]; then
     if [ -d "$from" ]; then
-      if cp -Rf "$from/." "$to/" &>/dev/null; then
-        printf '%s\n' "Copied: $from > $to"
+      if cp -Rf "$from/." "$dest/" &>/dev/null; then
+        printf '%s\n' "Copied: $from > $dest"
         return 0
       else
-        printf '%s\n' "Copy failed: $from < $to" >&2
+        printf '%s\n' "Copy failed: $from < $dest" >&2
         return 1
       fi
     else
-      if cp -Rf "$from" "$to" &>/dev/null; then
-        printf '%s\n' "Copied: $from > $to"
+      if cp -Rf "$from" "$dest" &>/dev/null; then
+        printf '%s\n' "Copied: $from > $dest"
         return 0
       else
-        printf '%s\n' "Copy failed: $from < $to" >&2
+        printf '%s\n' "Copy failed: $from < $dest" >&2
         return 1
       fi
     fi
@@ -319,7 +346,7 @@ __file_copy() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __generate_random_uids() {
-  local set_random_uid="$(seq 3000 50000 | sort -R | head -n 1)"
+  local set_random_uid="$(seq 3000 5000 | sort -R | head -n 1)"
   while :; do
     if grep -qs "x:.*:$set_random_uid:" "/etc/group" && ! grep -sq "x:$set_random_uid:.*:" "/etc/passwd"; then
       set_random_uid=$((set_random_uid + 1))
@@ -389,23 +416,31 @@ __fix_permissions() {
   fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__get_gid() { grep "^$1:" /etc/group | awk -F ':' '{print $3}' || false; }
+__get_uid() { grep "^$1:" /etc/passwd | awk -F ':' '{print $3}' || false; }
+__check_for_uid() { cat "/etc/passwd" 2>/dev/null | awk -F ':' '{print $3}' | sort -u | grep -q "^$1$" || false; }
+__check_for_guid() { cat "/etc/group" 2>/dev/null | awk -F ':' '{print $3}' | sort -u | grep -q "^$1$" || false; }
+__check_for_user() { cat "/etc/passwd" 2>/dev/null | awk -F ':' '{print $1}' | sort -u | grep -q "^$1$" || false; }
+__check_for_group() { cat "/etc/group" 2>/dev/null | awk -F ':' '{print $1}' | sort -u | grep -q "^$1$" || false; }
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __set_user_group_id() {
-  local set_user="${1:-$SERVICE_USER}"
-  local set_uid="${2:-${SERVICE_UID:-10000}}"
-  local set_gid="${3:-${SERVICE_GID:-10000}}"
-  local random_id="$(__generate_random_uids)"
   local exitStatus=0
+  local set_user="${1:-$SERVICE_USER}"
+  local set_uid="${2:-${SERVICE_UID:-1000}}"
+  local set_gid="${3:-${SERVICE_GID:-1000}}"
+  local random_id="$(__generate_random_uids)"
+  set_uid="$(__get_uid "$set_user" || echo "$set_uid")"
+  set_gid="$(__get_gid "$set_user" || echo "$set_gid")"
+  grep -sq "^$create_user:" "/etc/passwd" "/etc/group" || return 0
   [ -n "$set_user" ] && [ "$set_user" != "root" ] || return
-  { [ -n "$set_uid" ] && [ "$set_uid" != "0" ]; } || return
-  { [ -n "$set_gid" ] && [ "$set_gid" != "0" ]; } || return
-  [ -n "$set_user" ] && [ -n "$set_uid" ] && [ -n "$set_gid" ] || return
   if grep -sq "^$set_user:" "/etc/passwd" "/etc/group"; then
-    if ! grep -sq "x:.*:$set_gid:" "/etc/group"; then
-      groupmod -g "${set_gid}" $set_user | tee -p -a "${LOG_DIR/tmp/}/init.txt" &>/dev/null
-      chown -Rf $set_user
+    if __check_for_guid "$set_gid"; then
+      groupmod -g "${set_gid}" $set_user 2>/dev/stderr | tee -p -a "${LOG_DIR/tmp/}/init.txt" &>/dev/null &&
+        chown -Rf ":$set_gid"
     fi
-    if ! grep -sq "x:$set_uid:.*:" "/etc/passwd"; then
-      usermod -u "${set_uid}" -g "${set_gid}" $set_user | tee -p -a "${LOG_DIR/tmp/}/init.txt" &>/dev/null
+    if __check_for_uid "$set_uid"; then
+      usermod -u "${set_uid}" -g "${set_gid}" $set_user 2>/dev/stderr | tee -p -a "${LOG_DIR/tmp/}/init.txt" &>/dev/null &&
+        chown -Rf $set_uid:$set_gid
     fi
   fi
   export SERVICE_UID="$set_uid"
@@ -413,29 +448,41 @@ __set_user_group_id() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __create_service_user() {
+  local exitStatus=0
+  local set_home_dir=""
   local create_user="${1:-$SERVICE_USER}"
   local create_group="${2:-$SERVICE_GROUP}"
   local create_home_dir="${3:-${WORK_DIR:-/home/$create_user}}"
   local create_uid="${4:-${SERVICE_UID:-$USER_UID}}"
   local create_gid="${5:-${SERVICE_GID:-$USER_GID}}"
   local random_id="$(__generate_random_uids)"
-  local set_home_dir=""
-  local exitStatus=0
-  { [ -n "$create_uid" ] && [ "$create_uid" != "0" ]; } || return
-  { [ -n "$create_gid" ] && [ "$create_gid" != "0" ]; } || return
-  [ -n "$create_user" ] && [ -n "$create_group" ] && [ "$create_user" != "root" ] || return 0
-  if ! grep -sqE "$create_group|$create_user" "/etc/group"; then
+  create_uid="$(__get_uid "$set_user" || echo "$create_uid")"
+  create_gid="$(__get_gid "$set_user" || echo "$create_gid")"
+  grep -sq "^$create_user:" "/etc/passwd" && grep -sq "^$create_group:" "/etc/group" && return
+  [ "$create_user" != "root" ] || return 0
+  [ -n "$create_uid" ] && [ "$create_uid" != "0" ] || create_uid="$random_id"
+  [ -n "$create_gid" ] && [ "$create_gid" != "0" ] || create_gid="$random_id"
+  while :; do
+    if __check_for_uid "$create_uid" && __check_for_guid "$create_gid"; then
+      create_uid=$(($random_id + 1))
+      create_gid="$create_uid"
+    else
+      break
+    fi
+  done
+  if ! __check_for_group "$create_group"; then
     echo "creating system group $create_group"
-    groupadd -g $create_gid $create_group | tee -p -a "${LOG_DIR/tmp/}/init.txt" &>/dev/null
+    groupadd -g $create_gid $create_group 2>/dev/stderr | tee -p -a "${LOG_DIR/tmp/}/init.txt" &>/dev/null
   fi
-  if ! grep -sqE "$create_uid|$create_user" "/etc/passwd"; then
+  if ! __check_for_user "$create_user"; then
     echo "creating system user $create_user"
-    useradd -u $create_uid -g $create_gid -c "Account for $create_user" -d "$create_home_dir" -s /bin/false $create_user | tee -p -a "$LOG_DIR/tmp/init.txt" &>/dev/null
+    useradd -u $create_uid -g $create_gid -c "Account for $create_user" -d "$create_home_dir" -s /bin/false $create_user 2>/dev/stderr | tee -p -a "$LOG_DIR/tmp/init.txt" &>/dev/null
   fi
   grep -qs "$create_group" "/etc/group" || exitStatus=$((exitCode + 1))
   grep -qs "$create_user" "/etc/passwd" || exitStatus=$((exitCode + 1))
   [ $exitStatus -eq 0 ] && export WORK_DIR="${set_home_dir:-}"
-  export SERVICE_UID="$create_uid" SERVICE_GID="$create_gid"
+  export SERVICE_UID="$create_uid"
+  export SERVICE_GID="$create_gid"
   return $exitStatus
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -464,15 +511,18 @@ __exec_command() {
   local prog_bin=""
   local exitCode="0"
   local cmdExec="${arg:-}"
+  local pre_exec="--login"
   prog_bin="$(echo "${arg[@]}" | tr ' ' '\n' | grep -v '^$' | head -n1 || echo '')"
   [ -n "$prog_bin" ] && prog="$(type -P "$prog_bin" 2>/dev/null || echo "$1")" || prog="bash"
-  cmdExec="$prog $cmdExec"
+  [ -n "$cmdExec" ] || cmdExec=""
   if [ -f "$prog" ]; then
     echo "${exec_message:-Executing command: $cmdExec}"
+    [ "$prog" = "sh" ] || [ "$prog" = "bash" ] || pre_exec="-c"
+
     if [ -x "/bin/bash" ]; then
-      eval bash -c "$cmdExec" || exitCode=1
+      eval bash $pre_exec $cmdExec || exitCode=1
     else
-      eval sh -c "$cmdExec" || exitCode=1
+      eval sh $pre_exec $cmdExec || exitCode=1
     fi
     [ "$exitCode" = 0 ] || exitCode=10
   elif [ -f "$prog" ] && [ ! -x "$prog" ]; then
@@ -489,30 +539,46 @@ __exec_command() {
 __start_init_scripts() {
   [ "$1" = " " ] && shift 1
   [ "$DEBUGGER" = "on" ] && echo "Enabling debugging" && set -o pipefail -x$DEBUGGER_OPTIONS || set -o pipefail
+  local retPID=""
   local basename=""
   local init_pids=""
-  local initStatus=0
+  local retstatus="0"
+  local initStatus="0"
   local init_dir="${1:-/usr/local/etc/docker/init.d}"
   local init_count="$(ls -A "$init_dir"/* 2>/dev/null | grep -v '\.sample' | wc -l)"
-  mkdir -p "/tmp" "/run" "/run/init.d"
-  chmod -R 777 "/tmp" "/run" "/run/init.d"
+  touch /run/__start_init_scripts.pid
+  mkdir -p "/tmp" "/run" "/run/init.d" "/usr/local/etc/docker/exec"
+  chmod -R 777 "/tmp" "/run" "/run/init.d" "/usr/local/etc/docker/exec"
   if [ "$init_count" -eq 0 ] || [ ! -d "$init_dir" ]; then
     mkdir -p "/data/logs/init"
-    while :; do echo "Running" >"/data/logs/init/keep_alive" && sleep 3600; done &
+    while :; do echo "Running: $(date)" >"/data/logs/init/keep_alive" && sleep 3600; done &
   else
     if [ -d "$init_dir" ]; then
       chmod -Rf 755 "$init_dir/"
-      [ -f "$init_dir/service.sample" ] && rm -Rf "$init_dir/service.sample"
+      [ -f "$init_dir/service.sample" ] && rm -Rf "$init_dir"/*.sample
       for init in "$init_dir"/*.sh; do
         if [ -f "$init" ]; then
           name="$(basename "$init")"
-          sleep 10 && sh -c "$init" && sleep 20 || false
-          initStatus=$(($? + initStatus))
+          service="$(printf '%s' "$name" | sed 's/^[^-]*-//;s|.sh$||g')"
+          printf '# - - - executing file: %s\n' "$init"
+          "$init"
+          retPID=$(__get_pid "$service")
+          if [ -n "$retPID" ]; then
+            initStatus="0"
+            sleep 20
+            printf '# - - - %s has been started - pid: %s\n' "$service" "${retPID:-error}"
+          else
+            initStatus="1"
+            sleep 10
+            printf '# - - - %s has falied to start - check log %s\n' "$service" "docker log $CONTAINER_NAME"
+          fi
           echo ""
         fi
+        retstatus=$(($initStatus + $initStatus))
       done
     fi
   fi
+  return $retstatus
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __setup_mta() {
@@ -693,18 +759,21 @@ __initialize_db_users() {
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __initialize_system_etc() {
   local conf_dir="$1"
-  local file="" directories=""
+  local dir=""
+  local file=()
+  local directories=()
   if [ -n "$conf_dir" ] && [ -e "$conf_dir" ]; then
-    files="$(find "$conf_dir"/* -not -path '*/env/*' -type f 2>/dev/null | sed 's|'/config/'||g' | sort -u | grep -v '^$' | grep '^' || false)"
-    directories="$(find "$conf_dir"/* -not -path '*/env/*' -type d 2>/dev/null | sed 's|'/config/'||g' | sort -u | grep -v '^$' | grep '^' || false)"
+    files=("$(find "$conf_dir"/* -not -path '*/env/*' -type f 2>/dev/null | sed 's|'/config/'||g' | sort -u | grep -v '^$' | grep '^' || false)")
+    directories=("$(find "$conf_dir"/* -not -path '*/env/*' -type d 2>/dev/null | sed 's|'/config/'||g' | sort -u | grep -v '^$' | grep '^' || false)")
     echo "Copying config files to system: $conf_dir > /etc/${conf_dir//\/config\//}"
-    if [ -n "$directories" ]; then
-      for d in $directories; do
-        echo "Creating directory: /etc/$d"
-        mkdir -p "/etc/$directories"
+    if [ -n "${directories[*]}" ]; then
+      for d in "${directories[@]}"; do
+        dir="/etc/$d"
+        echo "Creating directory: $dir"
+        mkdir -p "$dir"
       done
     fi
-    for f in $files; do
+    for f in "${files[@]}"; do
       etc_file="/etc/$f"
       conf_file="/config/$f"
       [ -f "$etc_file" ] && rm -Rf "$etc_file"
@@ -715,7 +784,7 @@ __initialize_system_etc() {
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __initialize_custom_bin_dir() {
-  SET_USR_BIN=""
+  local SET_USR_BIN=""
   [ -d "/data/bin" ] && SET_USR_BIN+="$(__find /data/bin f) "
   [ -d "/config/bin" ] && SET_USR_BIN+="$(__find /config/bin f) "
   if [ -n "$SET_USR_BIN" ]; then
@@ -803,7 +872,7 @@ __initialize_www_root() {
     cp -Rf "$DEFAULT_DATA_DIR/data/htdocs/." "$WWW_ROOT_DIR/" 2>/dev/null
   fi
   __initialize_web_health "$WWW_ROOT_DIR"
-  find "$WWW_ROOT_DIR" -type d -exec chmod -f 777 {} \;
+  find "$WWW_ROOT_DIR" -type d -exec chmod -f 777 {} \; 2>/dev/null
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 __is_htdocs_mounted() {
@@ -847,11 +916,12 @@ __start_php_dev_server() {
   if [ "$2" = "yes" ]; then
     if [ -d "/usr/share/httpd" ]; then
       find "/usr/share/httpd" -type f -not -path '.git*' -iname '*.php' -exec sed -i 's|[<].*SERVER_ADDR.*[>]|'${CONTAINER_IP4_ADDRESS:-127.0.0.1}'|g' {} \; 2>/dev/null
+      php -S 0.0.0.0:$PHP_DEV_SERVER_PORT -t "/usr/share/httpd"
     fi
     if ! echo "$1" | grep -q "^/usr/share/httpd"; then
       find "$1" -type f -not -path '.git*' -iname '*.php' -exec sed -i 's|[<].*SERVER_ADDR.*[>]|'${CONTAINER_IP4_ADDRESS:-127.0.0.1}'|g' {} \; 2>/dev/null
+      php -S 0.0.0.0:$PHP_DEV_SERVER_PORT -t "$1"
     fi
-    php -S 0.0.0.0:$PHP_DEV_SERVER_PORT -t "$1"
   fi
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -908,6 +978,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 __start_init_scripts
+export -f __get_pid __start_init_scripts __is_running __certbot __update_ssl_certs __create_ssl_cert
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # end of functions