From 897552d7a43d508a7f8231c846c1728151c2a0e3 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.com>
Date: Sat, 25 Feb 2023 13:11:45 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?=
 =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .dockerignore                                 |   7 +-
 .gitignore                                    |   5 +-
 bin/.gitkeep => .gitkeep                      |   0
 Dockerfile                                    | 188 +++++++---
 LICENSE.md                                    |   2 +-
 README.md                                     |  45 +--
 bin/entrypoint-tor.sh                         | 137 --------
 {data => rootfs}/.gitkeep                     |   0
 rootfs/usr/local/bin/entrypoint.sh            | 330 ++++++++++++++++++
 rootfs/usr/local/bin/start-tor.sh             | 214 ++++++++++++
 .../share/template-files/config}/tor/torrc    |  10 +-
 .../local/share/template-files/data/.gitkeep  |   0
 .../share/template-files/defaults/.gitkeep    |   0
 13 files changed, 721 insertions(+), 217 deletions(-)
 rename bin/.gitkeep => .gitkeep (100%)
 delete mode 100755 bin/entrypoint-tor.sh
 rename {data => rootfs}/.gitkeep (100%)
 create mode 100755 rootfs/usr/local/bin/entrypoint.sh
 create mode 100755 rootfs/usr/local/bin/start-tor.sh
 rename {config => rootfs/usr/local/share/template-files/config}/tor/torrc (89%)
 create mode 100644 rootfs/usr/local/share/template-files/data/.gitkeep
 create mode 100644 rootfs/usr/local/share/template-files/defaults/.gitkeep

diff --git a/.dockerignore b/.dockerignore
index f89c807..62efb77 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,9 @@
 # Files to ignore
-.gitignore
 .gitkeep
+.gitignore
+node_modules/**
 .node_modules/**
+**/.gitkeep
+**/.gitignore
+**/node_modules/**
+**/.node_modules/**
diff --git a/.gitignore b/.gitignore
index d347791..1922784 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
-# gitignore created on 10/02/22 at 16:31
+# gitignore created on 02/25/23 at 13:04
+# Disable reminder in prompt
+ignoredirmessage
+
 # Disable reminder in prompt
 ignoredirmessage
 
diff --git a/bin/.gitkeep b/.gitkeep
similarity index 100%
rename from bin/.gitkeep
rename to .gitkeep
diff --git a/Dockerfile b/Dockerfile
index 5560e1e..ec05b01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,53 +1,159 @@
-FROM casjaysdevdocker/nginx:latest as build
+# Docker image for tor using the alpine template
+ARG LICENSE="MIT"
+ARG IMAGE_NAME="tor"
+ARG PHP_SERVER="tor"
+ARG BUILD_DATE="Sat Feb 25 01:02:48 PM EST 2023"
+ARG LANGUAGE="en_US.UTF-8"
+ARG TIMEZONE="America/New_York"
+ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
+ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
+ARG DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
-ARG LICENSE=WTFPL \
-  IMAGE_NAME=tor \
-  TIMEZONE=America/New_York \
-  PORT="80 9053 9050 9080"
+ARG SERVICE_PORT="9050"
+ARG EXPOSE_PORTS="80 9053 9050 9080"
+ARG PHP_VERSION="system"
+ARG NODE_VERSION="system"
+ARG NODE_MANAGER="system"
 
-ENV SHELL=/bin/bash \
-  TERM=xterm-256color \
-  HOSTNAME=${HOSTNAME:-casjaysdev-$IMAGE_NAME} \
-  TZ=$TIMEZONE
+ARG USER="root"
+ARG DISTRO_VERSION="3.17"
+ARG CONTAINER_VERSION="latest"
+ARG IMAGE_VERSION="${DISTRO_VERSION}"
+ARG BUILD_VERSION="${DISTRO_VERSION}"
+ARG IMAGE_REPO="${IMAGE_REPO}"
 
-RUN mkdir -p /bin/ /config/ /data/ && \
-  rm -Rf /bin/.gitkeep /config/.gitkeep /data/.gitkeep && \
-  apk update -U --no-cache && \
-  apk add --no-cache tor
+FROM casjaysdevdocker/alpine:${IMAGE_VERSION} AS build
+ARG USER
+ARG LICENSE
+ARG TIMEZONE
+ARG LANGUAGE
+ARG IMAGE_NAME
+ARG PHP_SERVER
+ARG BUILD_DATE
+ARG SERVICE_PORT
+ARG EXPOSE_PORTS
+ARG NODE_VERSION
+ARG NODE_MANAGER
+ARG BUILD_VERSION
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
+ARG DISTRO_VERSION
+ARG PHP_VERSION
 
-COPY ./bin/. /usr/local/bin/
-COPY ./config/. /etc/
-COPY ./data/. /data/
+ARG PACK_LIST="bash bash-completion iproute2 ssmtp openssl wget curl jq ca-certificates \
+  tzdata mailcap git ncurses util-linux pciutils usbutils coreutils binutils findutils grep \
+  iproute2 sudo rsync zip certbot tini tor torsocks"
 
-FROM scratch
-ARG BUILD_DATE="$(date +'%Y-%m-%d %H:%M')"
-
-LABEL org.label-schema.name="tor" \
-  org.label-schema.description="Containerized version of tor" \
-  org.label-schema.url="https://hub.docker.com/r/casjaysdevdocker/tor" \
-  org.label-schema.vcs-url="https://github.com/casjaysdevdocker/tor" \
-  org.label-schema.build-date=$BUILD_DATE \
-  org.label-schema.version=$BUILD_DATE \
-  org.label-schema.vcs-ref=$BUILD_DATE \
-  org.label-schema.license="$LICENSE" \
-  org.label-schema.vcs-type="Git" \
-  org.label-schema.schema-version="latest" \
-  org.label-schema.vendor="CasjaysDev" \
-  maintainer="CasjaysDev <docker-admin@casjaysdev.com>"
-
-ENV SHELL="/bin/bash" \
-  TERM="xterm-256color" \
-  HOSTNAME="casjaysdev-tor" \
-  TZ="${TZ:-America/New_York}"
+ENV ENV=~/.bashrc
+ENV SHELL="/bin/sh"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV container="docker"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV HOSTNAME="casjaysdev-tor"
 
+USER ${USER}
 WORKDIR /root
 
-VOLUME ["/config","/data"]
+COPY ./rootfs/. /
 
-EXPOSE $PORT
+RUN set -ex; \
+  rm -Rf "/etc/apk/repositories"; \
+  [ "$DISTRO_VERSION" = "latest" ] && DISTRO_VERSION="edge"; \
+  [ "$DISTRO_VERSION" = "edge" ] || DISTRO_VERSION="v${DISTRO_VERSION}" ; \
+  mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_CONF_DIR}" "${DEFAULT_TEMPLATE_DIR}"; \
+  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/main" >>"/etc/apk/repositories"; \
+  echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/community" >>"/etc/apk/repositories"; \
+  if [ "${DISTRO_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${DISTRO_VERSION}/testing" >>"/etc/apk/repositories" ; fi ; \
+  apk update --update-cache && apk add --no-cache ${PACK_LIST}
+
+RUN echo
+
+RUN echo "$TIMEZONE" >"/etc/timezone" ; \
+  touch "/etc/profile" "/root/.profile" ; \
+  PHP_FPM="$(ls /usr/*bin/php*fpm* 2>/dev/null)" ; \
+  echo 'hosts: files dns' >"/etc/nsswitch.conf" ; \
+  [ -f "/etc/bash/bashrc" ] && cp -Rf "/etc/bash/bashrc" "/root" ; \
+  sed -i 's|root:x:.*|root:x:0:0:root:/root:/bin/bash|g' "/etc/passwd" ; \
+  [ -f "/usr/share/zoneinfo/${TZ}" ] && ln -sf "/usr/share/zoneinfo/${TZ}" "/etc/localtime" ; \
+  [ -n "$PHP_FPM" ] && [ -z "$(type -P php-fpm)" ] && ln -sf "$PHP_FPM" "/usr/bin/php-fpm" ; \
+  rm -rf "/bin/sh" ; BASH_CMD="$(type -P bash)" ; [ -f "$BASH_CMD" ] && ln -sf "$BASH_CMD" "/bin/sh" ; \
+  printf '# Profile\n\n%s\n%s\n%s\n' '. /etc/profile' '. /root/.profile' "alias quit='exit 0 2>/dev/null'" >"/root/.bashrc" ; \
+  if [ -f "/etc/profile.d/color_prompt.sh.disabled" ]; then mv -f "/etc/profile.d/color_prompt.sh.disabled" "/etc/profile.d/color_prompt.sh"; fi
+
+RUN echo 'Running cleanup' ; \
+  rm -rf /etc/systemd/system/*.wants/* ; \
+  rm -rf /lib/systemd/system/systemd-update-utmp* ; \
+  rm -rf /lib/systemd/system/local-fs.target.wants/* ; \
+  rm -rf /lib/systemd/system/multi-user.target.wants/* ; \
+  rm -rf /lib/systemd/system/sockets.target.wants/*udev* ; \
+  rm -rf /lib/systemd/system/sockets.target.wants/*initctl* ; \
+  rm -Rf /usr/share/doc/* /usr/share/info/* /tmp/* /var/tmp/* ; \
+  rm -Rf /usr/local/bin/.gitkeep /usr/local/bin/.gitkeep /config /data /var/cache/apk/* ; \
+  if [ -d "/lib/systemd/system/sysinit.target.wants" ]; then cd "/lib/systemd/system/sysinit.target.wants" && rm -f $(ls | grep -v systemd-tmpfiles-setup) ; fi
+
+FROM scratch
+ARG USER
+ARG LICENSE
+ARG LANGUAGE
+ARG TIMEZONE
+ARG IMAGE_NAME
+ARG PHP_SERVER
+ARG BUILD_DATE
+ARG SERVICE_PORT
+ARG EXPOSE_PORTS
+ARG NODE_VERSION
+ARG NODE_MANAGER
+ARG BUILD_VERSION
+ARG DEFAULT_DATA_DIR
+ARG DEFAULT_CONF_DIR
+ARG DEFAULT_TEMPLATE_DIR
+ARG DISTRO_VERSION
+ARG PHP_VERSION
+
+USER ${USER}
+WORKDIR /root
+
+LABEL maintainer="CasjaysDev <docker-admin@casjaysdev.com>"
+LABEL org.opencontainers.image.vendor="CasjaysDev"
+LABEL org.opencontainers.image.authors="CasjaysDev"
+LABEL org.opencontainers.image.vcs-type="Git"
+LABEL org.opencontainers.image.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.base.name="${IMAGE_NAME}"
+LABEL org.opencontainers.image.license="${LICENSE}"
+LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}"
+LABEL org.opencontainers.image.build-date="${BUILD_DATE}"
+LABEL org.opencontainers.image.version="${BUILD_VERSION}"
+LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}"
+LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/${IMAGE_NAME}"
+LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/${IMAGE_NAME}"
+LABEL org.opencontainers.image.url.source="https://github.com/casjaysdevdocker/${IMAGE_NAME}"
+LABEL org.opencontainers.image.documentation="https://hub.docker.com/r/casjaysdevdocker/${IMAGE_NAME}"
+LABEL org.opencontainers.image.description="Containerized version of ${IMAGE_NAME}"
+LABEL com.github.containers.toolbox="false"
+
+ENV ENV=~/.bashrc
+ENV SHELL="/bin/bash"
+ENV TZ="${TIMEZONE}"
+ENV TIMEZONE="${TZ}"
+ENV container="docker"
+ENV LANG="${LANGUAGE}"
+ENV TERM="xterm-256color"
+ENV PORT="${SERVICE_PORT}"
+ENV PHP_SERVER="${PHP_SERVER}"
+ENV PHP_VERSION="${PHP_VERSION}"
+ENV CONTAINER_NAME="${IMAGE_NAME}"
+ENV HOSTNAME="casjaysdev-${IMAGE_NAME}"
+ENV USER="${USER}"
 
 COPY --from=build /. /
 
-ENTRYPOINT [ "tini", "--" ]
-HEALTHCHECK --interval=15s --timeout=3s CMD [ "/usr/local/bin/entrypoint-tor.sh", "healthcheck" ]
-CMD [ "/usr/local/bin/entrypoint-tor.sh" ]
+VOLUME [ "/config","/data" ]
+
+EXPOSE $EXPOSE_PORTS
+
+#CMD [ "" ]
+ENTRYPOINT [ "tini", "-p", "SIGTERM", "--", "/usr/local/bin/entrypoint.sh" ]
+HEALTHCHECK --start-period=1m --interval=2m --timeout=3s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]
diff --git a/LICENSE.md b/LICENSE.md
index d5b7ec5..cececca 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,7 +1,7 @@
             DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE  
                     Version 2, December 2004  
 
- Copyright (C) 2022 casjay <git-admin@casjaysdev.com>  
+ Copyright (C) 2023 casjay <git-admin@casjaysdev.com>  
   
  Everyone is permitted to copy and distribute verbatim or modified  
  copies of this license document, and changing it is allowed as long  
diff --git a/README.md b/README.md
index d7810f4..589d994 100644
--- a/README.md
+++ b/README.md
@@ -3,47 +3,34 @@
 tor README  
   
   
-## Run container
+## Install my system scripts  
 
 ```shell
-dockermgr update tor
+ sudo bash -c "$(curl -q -LSsf "https://github.com/systemmgr/installer/raw/main/install.sh")"
+ sudo systemmgr --config && sudo systemmgr install scripts  
 ```
 
-### via command line
+## Get source files  
 
 ```shell
-docker pull casjaysdevdocker/tor:latest && \
-docker run -d \
---restart always \
---name casjaysdevdocker-tor \
---hostname casjaysdev-tor \
--e TZ=${TIMEZONE:-America/New_York} \
--v $HOME/.local/share/srv/docker/tor/files/data:/data:z \
--v $HOME/.local/share/srv/docker/tor/files/config:/config:z \
--p 80:80 \
-casjaysdevdocker/tor:latest
+dockermgr download src tor
 ```
 
-### via docker-compose
+OR
 
-```yaml
-version: "2"
-services:
-  tor:
-    image: casjaysdevdocker/tor
-    container_name: tor
-    environment:
-      - TZ=America/New_York
-      - HOSTNAME=casjaysdev-tor
-    volumes:
-      - $HOME/.local/share/srv/docker/tor/files/data:/data:z
-      - $HOME/.local/share/srv/docker/tor/files/config:/config:z
-    ports:
-      - 80:80
-    restart: always
+```shell
+git clone "https://github.com/casjaysdevdocker/tor" "$HOME/Projects/github/casjaysdevdocker/tor"
+```
+
+## Build container  
+
+```shell
+cd "$HOME/Projects/github/casjaysdevdocker/tor"
+buildx 
 ```
 
 ## Authors  
 
+📽 dockermgr: [Github](https://github.com/dockermgr) 📽  
 🤖 casjay: [Github](https://github.com/casjay) [Docker](https://hub.docker.com/r/casjay) 🤖  
 ⛵ CasjaysDevDocker: [Github](https://github.com/casjaysdevdocker) [Docker](https://hub.docker.com/r/casjaysdevdocker) ⛵  
diff --git a/bin/entrypoint-tor.sh b/bin/entrypoint-tor.sh
deleted file mode 100755
index 796ed72..0000000
--- a/bin/entrypoint-tor.sh
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/usr/bin/env bash
-# shellcheck shell=bash
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-##@Version           :  202210021627-git
-# @@Author           :  Jason Hempstead
-# @@Contact          :  jason@casjaysdev.com
-# @@License          :  WTFPL
-# @@ReadME           :  entrypoint-tor.sh --help
-# @@Copyright        :  Copyright: (c) 2022 Jason Hempstead, Casjays Developments
-# @@Created          :  Sunday, Oct 02, 2022 16:27 EDT
-# @@File             :  entrypoint-tor.sh
-# @@Description      :
-# @@Changelog        :  New script
-# @@TODO             :  Better documentation
-# @@Other            :
-# @@Resource         :
-# @@Terminal App     :  no
-# @@sudo/root        :  no
-# @@Template         :  other/docker-entrypoint
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Set bash options
-[ -n "$DEBUG" ] && set -x
-set -o pipefail
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-APPNAME="$(basename "$0" 2>/dev/null)"
-VERSION="202210021627-git"
-HOME="${USER_HOME:-$HOME}"
-USER="${SUDO_USER:-$USER}"
-RUN_USER="${SUDO_USER:-$USER}"
-SCRIPT_SRC_DIR="${BASH_SOURCE%/*}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Set functions
-__version() { echo -e ${GREEN:-}"$VERSION"${NC:-}; }
-__find() { ls -A "$*" 2>/dev/null; }
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# colorization
-[ -n "$SHOW_RAW" ] || printf_color() { echo -e '\t\t'${2:-}"${1:-}${NC}"; }
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-__exec_bash() {
-  local cmd="${*:-/bin/bash}"
-  local exitCode=0
-  echo "Executing command: $cmd"
-  $cmd || exitCode=10
-  return ${exitCode:-$?}
-}
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Define default variables
-TZ="${TZ:-America/New_York}"
-HOSTNAME="${HOSTNAME:-casjaysdev-bin}"
-BIN_DIR="${BIN_DIR:-/usr/local/bin}"
-DATA_DIR="${DATA_DIR:-$(__find /data/ 2>/dev/null | grep '^' || false)}"
-CONFIG_DIR="${CONFIG_DIR:-$(__find /config/ 2>/dev/null | grep '^' || false)}"
-CONFIG_COPY="${CONFIG_COPY:-false}"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Additional variables
-
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Export variables
-export TZ HOSTNAME
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# import variables from file
-[ -f "/root/env.sh" ] && . "/root/env.sh"
-[ -f "/config/.env.sh" ] && . "/config/.env.sh"
-[ -f "/root/env.sh" ] && [ ! -f "/config/.env.sh" ] && cp -Rf "/root/env.sh" "/config/.env.sh"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Set timezone
-[ -n "${TZ}" ] && echo "${TZ}" >/etc/timezone
-[ -f "/usr/share/zoneinfo/${TZ}" ] && ln -sf "/usr/share/zoneinfo/${TZ}" "/etc/localtime"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Set hostname
-if [ -n "${HOSTNAME}" ]; then
-  echo "${HOSTNAME}" >/etc/hostname
-  echo "127.0.0.1 ${HOSTNAME} localhost ${HOSTNAME}.local" >/etc/hosts
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Delete any gitkeep files
-[ -n "${CONFIG_DIR}" ] && { [ -d "${CONFIG_DIR}" ] && rm -Rf "${CONFIG_DIR}/.gitkeep" || mkdir -p "/config/"; }
-[ -n "${DATA_DIR}" ] && { [ -d "${DATA_DIR}" ] && rm -Rf "${DATA_DIR}/.gitkeep" || mkdir -p "/data/"; }
-[ -n "${BIN_DIR}" ] && { [ -d "${BIN_DIR}" ] && rm -Rf "${BIN_DIR}/.gitkeep" || mkdir -p "/bin/"; }
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Copy config files to /etc
-if [ -n "${CONFIG_DIR}" ] && [ "${CONFIG_COPY}" = "true" ]; then
-  for config in ${CONFIG_DIR}; do
-    if [ -d "/config/$config" ]; then
-      [ -d "/etc/$config" ] || mkdir -p "/etc/$config"
-      cp -Rf "/config/$config/." "/etc/$config/"
-    elif [ -f "/config/$config" ]; then
-      cp -Rf "/config/$config" "/etc/$config"
-    fi
-  done
-fi
-[ -f "/etc/.env.sh" ] && rm -Rf "/etc/.env.sh"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Additional commands
-[ -d "/data/tor" ] || mkdir -p "/data/tor"
-[ -d "/config/tor" ] || mkdir -p "/config/tor"
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-if [ -f "/config/tor/torrc" ]; then
-  cp -Rf "/config/tor/torrc" "/etc/tor/torrc"
-else
-  cp -Rf "/etc/tor/torrc" "/config/tor/torrc"
-fi
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-case "$1" in
---help) # Help message
-  echo 'Docker container for '$APPNAME''
-  echo "Usage: $APPNAME [healthcheck, bash, command]"
-  echo "Failed command will have exit code 10"
-  echo
-  exitCode=$?
-  ;;
-
-healthcheck) # Docker healthcheck
-  echo "$(uname -s) $(uname -m) is running"
-  echo _other_commands here
-  exitCode=$?
-  ;;
-
-*/bin/sh | */bin/bash | bash | shell | sh) # Launch shell
-  shift 1
-  __exec_bash "${@:-/bin/bash}"
-  exitCode=$?
-  ;;
-
-*) # Execute primary command
-  if [ $# -eq 0 ]; then
-    tor -f /etc/tor/torrc
-  else
-    __exec_bash "$@"
-  fi
-  exitCode=$?
-  ;;
-esac
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# end of entrypoint
-exit ${exitCode:-$?}
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/data/.gitkeep b/rootfs/.gitkeep
similarity index 100%
rename from data/.gitkeep
rename to rootfs/.gitkeep
diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh
new file mode 100755
index 0000000..9d6b07c
--- /dev/null
+++ b/rootfs/usr/local/bin/entrypoint.sh
@@ -0,0 +1,330 @@
+#!/usr/bin/env bash
+# shellcheck shell=bash
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+##@Version           :  202302251304-git
+# @@Author           :  Jason Hempstead
+# @@Contact          :  jason@casjaysdev.com
+# @@License          :  WTFPL
+# @@ReadME           :  entrypoint.sh --help
+# @@Copyright        :  Copyright: (c) 2023 Jason Hempstead, Casjays Developments
+# @@Created          :  Saturday, Feb 25, 2023 13:04 EST
+# @@File             :  entrypoint.sh
+# @@Description      :  entrypoint point for tor
+# @@Changelog        :  New script
+# @@TODO             :  Better documentation
+# @@Other            :  
+# @@Resource         :  
+# @@Terminal App     :  no
+# @@sudo/root        :  no
+# @@Template         :  other/docker-entrypoint
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Setup trap
+trap 'retVal=$?;kill -9 $$;exit $retVal' SIGINT
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set bash options
+[ -n "$DEBUG" ] && set -x
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set functions
+__exec_command() {
+  local exitCode=0
+  local cmd="${*:-bash -l}"
+  echo "${exec_message:-Executing command: $cmd}"
+  $cmd || exitCode=1
+  [ "$exitCode" = 0 ] || exitCode=10
+  return ${exitCode:-$?}
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__curl() { curl -q -LSsf -o /dev/null "$@" &>/dev/null || return 10; }
+__find() { find "$1" -mindepth 1 -type ${2:-f,d} 2>/dev/null | grep '^' || return 10; }
+__pcheck() { [ -n "$(which pgrep 2>/dev/null)" ] && pgrep -x "$1" &>/dev/null || return 10; }
+__pgrep() { __pcheck "${1:-$SERVICE_NAME}" || ps aux 2>/dev/null | grep -Fw " ${1:-$SERVICE_NAME}" | grep -qv ' grep' || return 10; }
+__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'; }
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__certbot() {
+  [ -n "$DOMAINNAME" ] && [ -n "$CERT_BOT_MAIL" ] || { echo "The variables DOMAINNAME and CERT_BOT_MAIL are set" && exit 1; }
+  [ "$SSL_CERT_BOT" = "true" ] && type -P certbot &>/dev/null || { export SSL_CERT_BOT="" && return 10; }
+  certbot $1 --agree-tos -m $CERT_BOT_MAIL certonly --webroot -w "${WWW_ROOT_DIR:-/data/htdocs/www}" -d $DOMAINNAME -d $DOMAINNAME \
+    --put-all-related-files-into "$SSL_DIR" -key-path "$SSL_KEY" -fullchain-path "$SSL_CERT"
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__heath_check() {
+  local healthStatus=0 health="Good"
+  for proc in $SERVICES_LIST; do
+    if ! __pgrep "$proc"; then
+      echo "$proc is not running" >&2
+      status=$((status + 1))
+    fi
+  done
+  #__curl "http://localhost:$SERVICE_PORT/server-health" || healthStatus=$((healthStatus + 1))
+  [ "$healthStatus" -eq 0 ] || health="Errors reported see docker logs --follow $CONTAINER_NAME"
+  return $healthStatus
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__start_all_services() {
+  start-tor.sh
+  return $?
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional functions
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# export functions
+export -f __exec_command __pcheck __pgrep __find __curl __heath_check __certbot
+export -f __start_all_services __get_ip4 __get_ip6
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Define default variables - do not change these - redefine with -e or set under Additional
+USER="${USER:-root}"
+DISPLAY="${DISPLAY:-}"
+LANG="${LANG:-C.UTF-8}"
+DOMAINNAME="${DOMAINNAME:-}"
+TZ="${TZ:-America/New_York}"
+PHP_VERSION="${PHP_VERSION//php/}"
+SERVICE_USER="${SERVICE_USER:-root}"
+SERVICE_PORT="${SERVICE_PORT:-$PORT}"
+HOSTNAME="${HOSTNAME:-casjaysdev-tor}"
+HOSTADMIN="${HOSTADMIN:-root@${DOMAINNAME:-$HOSTNAME}}"
+CERT_BOT_MAIL="${CERT_BOT_MAIL:-certbot-mail@casjay.net}"
+SSL_CERT_BOT="${SSL_CERT_BOT:-false}"
+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}"
+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}"
+CONTAINER_IP_ADDRESS="$(__get_ip4)"
+CONTAINER_IP6_ADDRESS="$(__get_ip6)"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional variables and variable overrides
+SERVICE_NAME="tor"
+SERVICES_LIST="tor "
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Show start message
+ENTRYPOINT_MESSAGE="false"
+echo "Executing entrypoint script for $SERVICE_NAME"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+[ "$SERVICE_PORT" = "443" ] && SSL_ENABLED="true"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Check if this is a new container
+[ -f "/data/.docker_has_run" ] && DATA_DIR_INITIALIZED="true" || DATA_DIR_INITIALIZED="false"
+[ -f "/config/.docker_has_run" ] && CONFIG_DIR_INITIALIZED="true" || CONFIG_DIR_INITIALIZED="false"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# export variables
+export USER LANG TZ DOMAINNAME HOSTNAME HOSTADMIN SSL_ENABLED SSL_DIR SSL_CA
+export SSL_KEY SERVICE_NAME SSL_DIR LOCAL_BIN_DIR SSL_CONTAINER_DIR SSL_CERT_BOT
+export DEFAULT_CONF_DIR CONTAINER_IP_ADDRESS DISPLAY CONFIG_DIR_INITIALIZED DATA_DIR_INITIALIZED
+export SERVICE_USER ENTRYPOINT_MESSAGE PHP_VERSION
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# import variables from file
+[ -f "/root/env.sh" ] && . "/root/env.sh"
+[ -f "/config/env.sh" ] && . "/config/env.sh"
+[ -f "/config/.env.sh" ] && . "/config/.env.sh"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# 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" ] && echo "$HOSTNAME" >"/etc/hostname"
+if [ -w "/etc/hosts" ] && [ -n "$HOSTNAME" ]; then
+  echo "${CONTAINER_IP_ADDRESS:-127.0.0.1}    $HOSTNAME $HOSTNAME.local" >>"/etc/hosts"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Add domain to hosts file
+[ -n "$DOMAINNAME" ] && echo "$HOSTNAME.${DOMAINNAME:-local}" >"/etc/hostname"
+if [ -w "/etc/hosts" ] && [ -n "$DOMAINNAME" ]; then
+  echo "${CONTAINER_IP_ADDRESS:-127.0.0.1}    $HOSTNAME.${DOMAINNAME:-local}" >"/etc/hosts"
+  echo "${CONTAINER_IP_ADDRESS:-127.0.0.1}    $HOSTNAME.$DOMAINNAME" >>"/etc/hosts"
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# import hosts file into container
+[ -f "/usr/local/etc/hosts" ] && cat "/usr/local/etc/hosts" >>"/etc/hosts"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Delete any gitkeep files
+[ -d "/data" ] && rm -Rf "/data/.gitkeep" "/data"/*/*.gitkeep
+[ -d "/config" ] && rm -Rf "/config/.gitkeep" "/data"/*/*.gitkeep
+[ -f "/usr/local/bin/.gitkeep" ] && rm -Rf "/usr/local/bin/.gitkeep"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Create directories
+[ -d "/etc/ssl" ] || mkdir -p "$SSL_CONTAINER_DIR"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Create files
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Create symlinks
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+if [ "$SSL_ENABLED" = "true" ] || [ "$SSL_ENABLED" = "yes" ]; then
+  if [ -f "/config/ssl/server.crt" ] && [ -f "/config/ssl/server.key" ]; then
+    export SSL_ENABLED="true"
+    if [ -n "$SSL_CA" ] && [ -f "$SSL_CA" ]; then
+      mkdir -p "$SSL_CONTAINER_DIR/certs"
+      cat "$SSL_CA" >>"/etc/ssl/certs/ca-certificates.crt"
+      cp -Rf "/config/ssl/." "$SSL_CONTAINER_DIR/"
+    fi
+  else
+    [ -d "$SSL_DIR" ] || mkdir -p "$SSL_DIR"
+    create-ssl-cert
+  fi
+  type update-ca-certificates &>/dev/null && update-ca-certificates
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+[ -f "$SSL_CA" ] && cp -Rfv "$SSL_CA" "$SSL_CONTAINER_DIR/ca.crt"
+[ -f "$SSL_KEY" ] && cp -Rfv "$SSL_KEY" "$SSL_CONTAINER_DIR/server.key"
+[ -f "$SSL_CERT" ] && cp -Rfv "$SSL_CERT" "$SSL_CONTAINER_DIR/server.crt"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# 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"
+  for create_bin in $SET_USR_BIN; do
+    if [ -n "$create_bin" ]; then
+      create_bin_name="$(basename "$create_bin")"
+      ln -sf "$create_bin" "$LOCAL_BIN_DIR/$create_bin_name"
+    fi
+  done
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Create default config
+if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -d "/config" ]; then
+  echo "Copying default config files"
+  if [ -n "$DEFAULT_TEMPLATE_DIR" ] && [ -d "$DEFAULT_TEMPLATE_DIR" ]; then
+    for create_template in "$DEFAULT_TEMPLATE_DIR"/*; do
+      create_template_name="$(basename "$create_template")"
+      if [ -n "$create_template" ]; then
+        if [ -d "$create_template" ]; then
+          mkdir -p "/config/$create_template_name/"
+          cp -Rf "$create_template/." "/config/$create_template_name/" 2>/dev/null
+        else
+          cp -Rf "$create_template" "/config/$create_template_name" 2>/dev/null
+        fi
+      fi
+    done
+  fi
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Copy custom config files
+if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -d "/config" ]; then
+  echo "Copying custom config files"
+  for create_config in "$DEFAULT_CONF_DIR"/*; do
+    create_config_name="$(basename "$create_config")"
+    if [ -n "$create_config" ]; then
+      if [ -d "$create_config" ]; then
+        mkdir -p "/config/$create_config_name"
+        cp -Rf "$create_config/." "/config/$create_config_name/" 2>/dev/null
+      else
+        cp -Rf "$create_config" "/config/$create_config_name" 2>/dev/null
+      fi
+    fi
+  done
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Copy custom data files
+if [ "$DATA_DIR_INITIALIZED" = "false" ] && [ -d "/data" ]; then
+  echo "Copying data files"
+  for create_data in "$DEFAULT_DATA_DIR"/*; do
+    create_data_name="$(basename "$create_data")"
+    if [ -n "$create_data" ]; then
+      if [ -d "$create_data" ]; then
+        mkdir -p "/data/$create_data_name"
+        cp -Rf "$create_data/." "/data/$create_data_name/" 2>/dev/null
+      else
+        cp -Rf "$create_data" "/data/$create_data_name" 2>/dev/null
+      fi
+    fi
+  done
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Copy /config to /etc
+if [ -d "/config" ]; then
+  [ "$CONFIG_DIR_INITIALIZED" = "false" ] && echo "Copying /config to /etc"
+  for create_conf in /config/*; do
+    if [ -n "$create_conf" ]; then
+      create_conf_name="$(basename "$create_conf")"
+      if [ -e "/etc/$create_conf_name" ]; then
+        if [ -d "/etc/$create_conf_name" ]; then
+          mkdir -p "/etc/$create_conf_name/"
+          cp -Rf "$create_conf/." "/etc/$create_conf_name/" 2>/dev/null
+        else
+          cp -Rf "$create_conf" "/etc/$create_conf_name" 2>/dev/null
+        fi
+      fi
+    fi
+  done
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Unset unneeded variables
+unset SET_USR_BIN create_bin create_bin_name create_template create_template_name
+unset create_data create_data_name create_config create_config_name create_conf create_conf_name
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+[ -f "/data/.docker_has_run" ] || { [ -d "/data" ] && echo "Initialized on: $(date)" >"/data/.docker_has_run"; }
+[ -f "/config/.docker_has_run" ] || { [ -d "/config" ] && echo "Initialized on: $(date)" >"/config/.docker_has_run"; }
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Additional commands
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Show message
+echo "Container ip address is: $CONTAINER_IP_ADDRESS"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+case "$1" in
+--help) # Help message
+  echo 'Docker container for '$APPNAME''
+  echo "Usage: $APPNAME [healthcheck, bash, command]"
+  echo "Failed command will have exit code 10"
+  echo ""
+  exit 0
+  ;;
+
+healthcheck) # Docker healthcheck
+  __heath_check || exitCode=10
+  exit ${exitCode:-$?}
+  ;;
+
+*/bin/sh | */bin/bash | bash | shell | sh) # Launch shell
+  shift 1
+  __exec_command "${@:-/bin/bash}"
+  exit ${exitCode:-$?}
+  ;;
+
+certbot)
+  shift 1
+  SSL_CERT_BOT="true"
+  if [ "$1" = "create" ]; then
+    shift 1
+    __certbot
+  elif [ "$1" = "renew" ]; then
+    shift 1
+    __certbot "renew certonly --force-renew"
+  else
+    __exec_command "certbot" "$@"
+  fi
+  ;;
+
+*) # Execute primary command
+  if [ $# -eq 0 ]; then
+    __start_all_services
+    exit ${exitCode:-$?}
+  else
+    __exec_command "$@"
+    exitCode=$?
+  fi
+  ;;
+esac
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# end of entrypoint
+exit ${exitCode:-$?}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+# ex: ts=2 sw=2 et filetype=sh
diff --git a/rootfs/usr/local/bin/start-tor.sh b/rootfs/usr/local/bin/start-tor.sh
new file mode 100755
index 0000000..74c7c70
--- /dev/null
+++ b/rootfs/usr/local/bin/start-tor.sh
@@ -0,0 +1,214 @@
+#!/usr/bin/env bash
+# shellcheck shell=bash
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+##@Version           :  202302251304-git
+# @@Author           :  Jason Hempstead
+# @@Contact          :  jason@casjaysdev.com
+# @@License          :  WTFPL
+# @@ReadME           :  start-tor.sh --help
+# @@Copyright        :  Copyright: (c) 2023 Jason Hempstead, Casjays Developments
+# @@Created          :  Saturday, Feb 25, 2023 13:04 EST
+# @@File             :  start-tor.sh
+# @@Description      :  script to start tor
+# @@Changelog        :  New script
+# @@TODO             :  Better documentation
+# @@Other            :
+# @@Resource         :
+# @@Terminal App     :  no
+# @@sudo/root        :  no
+# @@Template         :  other/start-service
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set trap
+trap -- 'retVal=$?;kill -9 $$;exit $retVal' SIGINT SIGTERM ERR EXIT
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set functions
+__cd() { [ -d "$1" ] && builtin cd "$1" || return 1; }
+__curl() { curl -q -LSsf -o /dev/null "$@" &>/dev/null || return 10; }
+__find() { find "$1" -mindepth 1 -type ${2:-f,d} 2>/dev/null | grep '^' || return 10; }
+__pcheck() { [ -n "$(which pgrep 2>/dev/null)" ] && pgrep -x "$1" &>/dev/null || return 10; }
+__pgrep() { __pcheck "$1" || ps aux 2>/dev/null | grep -Fw " $1" | grep -qv ' grep' || return 10; }
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__certbot() {
+  [ -n "$DOMAINNAME" ] && [ -n "$CERT_BOT_MAIL" ] || { echo "The variables DOMAINNAME and CERT_BOT_MAIL are set" && exit 1; }
+  [ "$SSL_CERT_BOT" = "true" ] && type -P certbot &>/dev/null || { export SSL_CERT_BOT="" && return 10; }
+  certbot $1 --agree-tos -m $CERT_BOT_MAIL certonly --webroot \
+    -w "${WWW_ROOT_DIR:-/data/htdocs/www}" -d $DOMAINNAME -d $DOMAINNAME \
+    --put-all-related-files-into "$SSL_DIR" -key-path "$SSL_KEY" -fullchain-path "$SSL_CERT"
+  return $?
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__exec_command() {
+  local exitCode=0
+  local cmd="${*:-bash -l}"
+  echo "Executing: $cmd"
+  eval $cmd || exitCode=1
+  [ "$exitCode" = 0 ] || exitCode=10
+  return $exitCode
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__exec_service_start() {
+  [ -n "$DEBUG" ] && set -x
+  local exitCode=0 cmd="${SERVICE_COMMAND:-false}"
+  echo "Setting up service to run as $SERVICE_USER"
+  echo "Executing: $cmd "
+  if [ "$SERVICE_USER" = "root" ]; then
+    su_cmd() { eval "$@" || return 1; }
+  elif [ "$(builtin type -P su)" ]; then
+    su_cmd() { su -s /bin/sh - $SERVICE_USER -c "$@" || return 1; }
+  elif [ "$(builtin type -P runuser)" ]; then
+    su_cmd() { runuser -u $SERVICE_USER "$@" || return 1; }
+  elif [ "$(builtin type -P sudo)" ]; then
+    su_cmd() { sudo -u $SERVICE_USER "$@" || return 1; }
+  else
+    echo "Can not switch to $SERVICE_USER"
+    exit 10
+  fi
+  su_cmd "$cmd" && su_cmd "touch /tmp/$SERVICE_NAME.pid" || exitCode=1
+  [ "$exitCode" -ne 0 ] && exitCode=10 && rm -Rf "/tmp/$SERVICE_NAME.pid"
+  return $exitCode
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__start_message() {
+  __pgrep "$SERVICE_NAME" && [ -f "/tmp/$SERVICE_NAME.pid" ] && echo "$SERVICE_NAME is running" && exit 0
+  if [ "$ENTRYPOINT_MESSAGE" = "false" ]; then
+    echo "Starting $SERVICE_NAME on port: $SERVICE_PORT"
+  else
+    echo "Starting $SERVICE_NAME on: $CONTAINER_IP_ADDRESS:$SERVICE_PORT"
+  fi
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__exec_pre_start() {
+  __start_message
+
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+__run_backup() {
+  local save="" date=""
+  save="${1:-$BACKUP_DIR}"
+  date="$(date '+%Y%m%d-%H%M')"
+  tar cfvz "$save/$date.tar.gz" --exclude="$save" "/data" "/config"
+  return $?
+}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set variables
+DISPLAY="${DISPLAY:-}"
+LANG="${LANG:-C.UTF-8}"
+DOMAINNAME="${DOMAINNAME:-}"
+TZ="${TZ:-America/New_York}"
+PORT="${SERVICE_PORT:-$PORT}"
+PHP_VERSION="${PHP_VERSION//php/}"
+HOSTNAME="${HOSTNAME:-casjaysdev-tor}"
+HOSTADMIN="${HOSTADMIN:-root@${DOMAINNAME:-$HOSTNAME}}"
+SSL_CERT_BOT="${SSL_CERT_BOT:-false}"
+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}"
+BACKUP_DIR="${BACKUP_DIR:-/config/backup}"
+WWW_ROOT_DIR="${WWW_ROOT_DIR:-/data/htdocs}"
+LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}"
+DATA_DIR_INITIALIZED="${DATA_DIR_INITIALIZED:-}"
+CONFIG_DIR_INITIALIZED="${CONFIG_DIR_INITIALIZED:-}"
+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}"
+CONTAINER_IP_ADDRESS="$(ip a 2>/dev/null | grep 'inet' | grep -v '127.0.0.1' | awk '{print $2}' | sed 's|/.*||g')"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Custom variables
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Overwrite variables
+WORKDIR=""
+SERVICE_PORT="$PORT"
+SERVICE_NAME="tor"
+SERVICE_USER="${SERVICE_USER:-root}"
+SERVICE_COMMAND="$SERVICE_NAME -f /config/tor/torrc"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+[ "$SERVICE_PORT" = "443" ] && SSL_ENABLED="true"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Pre copy commands
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Check if this is a new container
+[ -z "$DATA_DIR_INITIALIZED" ] && [ -f "/data/.docker_has_run" ] && DATA_DIR_INITIALIZED="true"
+[ -z "$CONFIG_DIR_INITIALIZED" ] && [ -f "/config/.docker_has_run" ] && CONFIG_DIR_INITIALIZED="true"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Create default config
+if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -n "$DEFAULT_TEMPLATE_DIR" ]; then
+  [ -d "/config" ] && cp -Rf "$DEFAULT_TEMPLATE_DIR/." "/config/" 2>/dev/null
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Copy custom config files
+if [ "$CONFIG_DIR_INITIALIZED" = "false" ] && [ -n "$DEFAULT_CONF_DIR" ]; then
+  [ -d "/config" ] && cp -Rf "$DEFAULT_CONF_DIR/." "/config/" 2>/dev/null
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Copy custom data files
+if [ "$DATA_DIR_INITIALIZED" = "false" ] && [ -n "$DEFAULT_DATA_DIR" ]; then
+  [ -d "/data" ] && cp -Rf "$DEFAULT_DATA_DIR/." "/data/" 2>/dev/null
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Copy html files
+if [ "$DATA_DIR_INITIALIZED" = "false" ] && [ -d "$DEFAULT_DATA_DIR/data/htdocs" ]; then
+  [ -d "/data" ] && cp -Rf "$DEFAULT_DATA_DIR/data/htdocs/." "$WWW_ROOT_DIR/" 2>/dev/null
+fi
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Create the backup dir
+[ -d "$BACKUP_DIR" ] || mkdir -p "$BACKUP_DIR"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Post copy commands
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Initialized
+[ -d "/data" ] && touch "/data/.docker_has_run"
+[ -d "/config" ] && touch "/config/.docker_has_run"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# APP Variables overrides
+[ -f "/root/env.sh" ] && . "/root/env.sh"
+[ -f "/config/env.sh" ] && . "/config/env.sh"
+[ -f "/config/.env.sh" ] && . "/config/.env.sh"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Actions based on env
+
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Change to working dir
+[ -n "$WORKDIR" ] && __cd "$WORKDIR"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# begin main app
+case "$1" in
+backup)
+  shift 1
+  __run_backup "${1:-$BACKUP_DIR}"
+  ;;
+
+certbot)
+  shift 1
+  SSL_CERT_BOT="true"
+  if [ "$1" = "create" ]; then
+    shift 1
+    __certbot
+  elif [ "$1" = "renew" ]; then
+    shift 1
+    __certbot "renew certonly --force-renew"
+  else
+    __exec_command "certbot" "$@"
+  fi
+  ;;
+
+*)
+  __exec_pre_start && __exec_service_start
+  ;;
+esac
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Set exit code
+exitCode="${exitCode:-$?}"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# End application
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# lets exit with code
+exit ${exitCode:-$?}
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# end
+# ex: ts=2 sw=2 et filetype=sh
diff --git a/config/tor/torrc b/rootfs/usr/local/share/template-files/config/tor/torrc
similarity index 89%
rename from config/tor/torrc
rename to rootfs/usr/local/share/template-files/config/tor/torrc
index c6125cb..93de79c 100644
--- a/config/tor/torrc
+++ b/rootfs/usr/local/share/template-files/config/tor/torrc
@@ -11,22 +11,18 @@ DataDirectory /data/tor
 ##### logging
 Log notice file /var/log/tor/notices.log
 #Log debug file /var/log/tor/debug.log
-
-##### This section is just for location-hidden services 
+##### This section is just for location-hidden services
 HiddenServiceDir /data/tor/hidden_service/default
 HiddenServicePort 80 127.0.0.1:80
-
-##### Server 
+##### Server
 ControlPort 9051
 SOCKSPort 9050
 HTTPTunnelPort 9080
-
 ##### dns forwarder
 DNSPort 9053
 AutomapHostsOnResolve 1
 AutomapHostsSuffixes .exit,.onion
-
-##### This section is just for relays 
+##### This section is just for relays
 #Nickname whateveryouwant
 #ContactInfo tor-admin@example.com
 #ORPort 443
diff --git a/rootfs/usr/local/share/template-files/data/.gitkeep b/rootfs/usr/local/share/template-files/data/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/rootfs/usr/local/share/template-files/defaults/.gitkeep b/rootfs/usr/local/share/template-files/defaults/.gitkeep
new file mode 100644
index 0000000..e69de29