🗃️ Committing everything that changed 🗃️

This commit is contained in:
casjay 2023-02-25 15:55:08 -05:00
parent c0cbaf2fba
commit 9a7ee5a0dc
No known key found for this signature in database
GPG Key ID: 4F765975C1F0EE5F
5 changed files with 17 additions and 12 deletions

2
.gitignore vendored
View File

@ -1,4 +1,4 @@
# gitignore created on 02/25/23 at 13:04 # gitignore created on 02/25/23 at 15:50
# Disable reminder in prompt # Disable reminder in prompt
ignoredirmessage ignoredirmessage

View File

@ -2,7 +2,7 @@
ARG LICENSE="MIT" ARG LICENSE="MIT"
ARG IMAGE_NAME="tor" ARG IMAGE_NAME="tor"
ARG PHP_SERVER="tor" ARG PHP_SERVER="tor"
ARG BUILD_DATE="Sat Feb 25 01:02:48 PM EST 2023" ARG BUILD_DATE="Sat Feb 25 03:50:56 PM EST 2023"
ARG LANGUAGE="en_US.UTF-8" ARG LANGUAGE="en_US.UTF-8"
ARG TIMEZONE="America/New_York" ARG TIMEZONE="America/New_York"
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data" ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
@ -16,9 +16,9 @@ ARG NODE_VERSION="system"
ARG NODE_MANAGER="system" ARG NODE_MANAGER="system"
ARG USER="root" ARG USER="root"
ARG DISTRO_VERSION="edge" ARG DISTRO_VERSION="3.17"
ARG CONTAINER_VERSION="latest" ARG CONTAINER_VERSION="latest"
ARG IMAGE_VERSION="latest" ARG IMAGE_VERSION="${DISTRO_VERSION}"
ARG BUILD_VERSION="${DISTRO_VERSION}" ARG BUILD_VERSION="${DISTRO_VERSION}"
ARG IMAGE_REPO="${IMAGE_REPO}" ARG IMAGE_REPO="${IMAGE_REPO}"

View File

@ -1,13 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck shell=bash # shellcheck shell=bash
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202302251304-git ##@Version : 202302251550-git
# @@Author : Jason Hempstead # @@Author : Jason Hempstead
# @@Contact : jason@casjaysdev.com # @@Contact : jason@casjaysdev.com
# @@License : WTFPL # @@License : WTFPL
# @@ReadME : entrypoint.sh --help # @@ReadME : entrypoint.sh --help
# @@Copyright : Copyright: (c) 2023 Jason Hempstead, Casjays Developments # @@Copyright : Copyright: (c) 2023 Jason Hempstead, Casjays Developments
# @@Created : Saturday, Feb 25, 2023 13:04 EST # @@Created : Saturday, Feb 25, 2023 15:50 EST
# @@File : entrypoint.sh # @@File : entrypoint.sh
# @@Description : entrypoint point for tor # @@Description : entrypoint point for tor
# @@Changelog : New script # @@Changelog : New script
@ -102,7 +102,7 @@ CONTAINER_IP6_ADDRESS="$(__get_ip6)"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Additional variables and variable overrides # Additional variables and variable overrides
SERVICE_NAME="tor" SERVICE_NAME="tor"
SERVICES_LIST="tor " SERVICES_LIST="tor php"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Show start message # Show start message
ENTRYPOINT_MESSAGE="false" ENTRYPOINT_MESSAGE="false"
@ -157,7 +157,6 @@ fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Create directories # Create directories
[ -d "/etc/ssl" ] || mkdir -p "$SSL_CONTAINER_DIR" [ -d "/etc/ssl" ] || mkdir -p "$SSL_CONTAINER_DIR"
[ -d "/run/tor" ] || mkdir -p "/run/tor"
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Create files # Create files
@ -266,6 +265,12 @@ if [ -d "/config" ]; then
done done
fi fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
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/server-health" ] || echo "OK" >"$WWW_ROOT_DIR/htdocs/www/server-health"
fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Unset unneeded variables # Unset unneeded variables
unset SET_USR_BIN create_bin create_bin_name create_template create_template_name 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 unset create_data create_data_name create_config create_config_name create_conf create_conf_name

View File

@ -1,13 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# shellcheck shell=bash # shellcheck shell=bash
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
##@Version : 202302251304-git ##@Version : 202302251550-git
# @@Author : Jason Hempstead # @@Author : Jason Hempstead
# @@Contact : jason@casjaysdev.com # @@Contact : jason@casjaysdev.com
# @@License : WTFPL # @@License : WTFPL
# @@ReadME : start-tor.sh --help # @@ReadME : start-tor.sh --help
# @@Copyright : Copyright: (c) 2023 Jason Hempstead, Casjays Developments # @@Copyright : Copyright: (c) 2023 Jason Hempstead, Casjays Developments
# @@Created : Saturday, Feb 25, 2023 13:04 EST # @@Created : Saturday, Feb 25, 2023 15:50 EST
# @@File : start-tor.sh # @@File : start-tor.sh
# @@Description : script to start tor # @@Description : script to start tor
# @@Changelog : New script # @@Changelog : New script