mirror of
https://github.com/dockersrc/alpine
synced 2025-02-08 00:36:46 -05:00
🗃️ Committing everything that changed 🗃️
Some checks failed
alpine-3-14 / alpine-3-14 (push) Successful in 16m28s
alpine-3-15 / alpine-3-15 (push) Failing after 2m14s
alpine-3-16 / alpine-3-16 (push) Successful in 21m36s
alpine-3-17 / alpine-3-17 (push) Successful in 20m12s
alpine-3-18 / alpine-3-18 (push) Successful in 18m11s
alpine-3-19 / alpine-3-19 (push) Successful in 19m22s
alpine-3-20 / alpine-3-20 (push) Successful in 20m20s
alpine-3-21 / alpine-3-20 (push) Successful in 25m51s
alpine-edge / alpine-edge (push) Successful in 25m42s
alpine-latest / alpine-latest (push) Successful in 23m24s
Some checks failed
alpine-3-14 / alpine-3-14 (push) Successful in 16m28s
alpine-3-15 / alpine-3-15 (push) Failing after 2m14s
alpine-3-16 / alpine-3-16 (push) Successful in 21m36s
alpine-3-17 / alpine-3-17 (push) Successful in 20m12s
alpine-3-18 / alpine-3-18 (push) Successful in 18m11s
alpine-3-19 / alpine-3-19 (push) Successful in 19m22s
alpine-3-20 / alpine-3-20 (push) Successful in 20m20s
alpine-3-21 / alpine-3-20 (push) Successful in 25m51s
alpine-edge / alpine-edge (push) Successful in 25m42s
alpine-latest / alpine-latest (push) Successful in 23m24s
Dockerfile Dockerfile.3.14 Dockerfile.3.15 Dockerfile.3.16 Dockerfile.3.17 Dockerfile.3.18 Dockerfile.3.19 Dockerfile.3.20 Dockerfile.3.21 Dockerfile.edge .env.scripts .env.scripts.3.14 .env.scripts.3.15 .env.scripts.3.16 .env.scripts.3.17 .env.scripts.3.18 .env.scripts.3.19 .env.scripts.3.20 .env.scripts.3.21 .env.scripts.edge rootfs/usr/local/etc/docker/functions/entrypoint.sh rootfs/usr/local/share/template-files/config/env/default.sample
This commit is contained in:
parent
197bc3fe1a
commit
51007bc2ea
@ -42,7 +42,7 @@ NODE_VERSION="system"
|
|||||||
NODE_MANAGER="system"
|
NODE_MANAGER="system"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Default directories
|
# Default directories
|
||||||
WWW_ROOT_DIR="/usr/share/httpd/default"
|
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -42,7 +42,7 @@ NODE_VERSION="system"
|
|||||||
NODE_MANAGER="system"
|
NODE_MANAGER="system"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Default directories
|
# Default directories
|
||||||
WWW_ROOT_DIR="/usr/share/httpd/default"
|
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -42,7 +42,7 @@ NODE_VERSION="system"
|
|||||||
NODE_MANAGER="system"
|
NODE_MANAGER="system"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Default directories
|
# Default directories
|
||||||
WWW_ROOT_DIR="/usr/share/httpd/default"
|
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -42,7 +42,7 @@ NODE_VERSION="system"
|
|||||||
NODE_MANAGER="system"
|
NODE_MANAGER="system"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Default directories
|
# Default directories
|
||||||
WWW_ROOT_DIR="/usr/share/httpd/default"
|
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -42,7 +42,7 @@ NODE_VERSION="system"
|
|||||||
NODE_MANAGER="system"
|
NODE_MANAGER="system"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Default directories
|
# Default directories
|
||||||
WWW_ROOT_DIR="/usr/share/httpd/default"
|
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -42,7 +42,7 @@ NODE_VERSION="system"
|
|||||||
NODE_MANAGER="system"
|
NODE_MANAGER="system"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Default directories
|
# Default directories
|
||||||
WWW_ROOT_DIR="/usr/share/httpd/default"
|
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -42,7 +42,7 @@ NODE_VERSION="system"
|
|||||||
NODE_MANAGER="system"
|
NODE_MANAGER="system"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Default directories
|
# Default directories
|
||||||
WWW_ROOT_DIR="/usr/share/httpd/default"
|
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -42,7 +42,7 @@ NODE_VERSION="system"
|
|||||||
NODE_MANAGER="system"
|
NODE_MANAGER="system"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Default directories
|
# Default directories
|
||||||
WWW_ROOT_DIR="/usr/share/httpd/default"
|
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -42,7 +42,7 @@ NODE_VERSION="system"
|
|||||||
NODE_MANAGER="system"
|
NODE_MANAGER="system"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Default directories
|
# Default directories
|
||||||
WWW_ROOT_DIR="/usr/share/httpd/default"
|
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -42,7 +42,7 @@ NODE_VERSION="system"
|
|||||||
NODE_MANAGER="system"
|
NODE_MANAGER="system"
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# Default directories
|
# Default directories
|
||||||
WWW_ROOT_DIR="/usr/share/httpd/default"
|
WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -5,7 +5,7 @@ ARG PHP_SERVER="alpine"
|
|||||||
ARG BUILD_DATE="202408111050"
|
ARG BUILD_DATE="202408111050"
|
||||||
ARG LANGUAGE="en_US.UTF-8"
|
ARG LANGUAGE="en_US.UTF-8"
|
||||||
ARG TIMEZONE="America/New_York"
|
ARG TIMEZONE="America/New_York"
|
||||||
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
|
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -5,7 +5,7 @@ ARG PHP_SERVER="alpine"
|
|||||||
ARG BUILD_DATE="202408111050"
|
ARG BUILD_DATE="202408111050"
|
||||||
ARG LANGUAGE="en_US.UTF-8"
|
ARG LANGUAGE="en_US.UTF-8"
|
||||||
ARG TIMEZONE="America/New_York"
|
ARG TIMEZONE="America/New_York"
|
||||||
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
|
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -5,7 +5,7 @@ ARG PHP_SERVER="alpine"
|
|||||||
ARG BUILD_DATE="202408111050"
|
ARG BUILD_DATE="202408111050"
|
||||||
ARG LANGUAGE="en_US.UTF-8"
|
ARG LANGUAGE="en_US.UTF-8"
|
||||||
ARG TIMEZONE="America/New_York"
|
ARG TIMEZONE="America/New_York"
|
||||||
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
|
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -5,7 +5,7 @@ ARG PHP_SERVER="alpine"
|
|||||||
ARG BUILD_DATE="202408111050"
|
ARG BUILD_DATE="202408111050"
|
||||||
ARG LANGUAGE="en_US.UTF-8"
|
ARG LANGUAGE="en_US.UTF-8"
|
||||||
ARG TIMEZONE="America/New_York"
|
ARG TIMEZONE="America/New_York"
|
||||||
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
|
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -5,7 +5,7 @@ ARG PHP_SERVER="alpine"
|
|||||||
ARG BUILD_DATE="202408111050"
|
ARG BUILD_DATE="202408111050"
|
||||||
ARG LANGUAGE="en_US.UTF-8"
|
ARG LANGUAGE="en_US.UTF-8"
|
||||||
ARG TIMEZONE="America/New_York"
|
ARG TIMEZONE="America/New_York"
|
||||||
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
|
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -5,7 +5,7 @@ ARG PHP_SERVER="alpine"
|
|||||||
ARG BUILD_DATE="202408111050"
|
ARG BUILD_DATE="202408111050"
|
||||||
ARG LANGUAGE="en_US.UTF-8"
|
ARG LANGUAGE="en_US.UTF-8"
|
||||||
ARG TIMEZONE="America/New_York"
|
ARG TIMEZONE="America/New_York"
|
||||||
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
|
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -5,7 +5,7 @@ ARG PHP_SERVER="alpine"
|
|||||||
ARG BUILD_DATE="202408111050"
|
ARG BUILD_DATE="202408111050"
|
||||||
ARG LANGUAGE="en_US.UTF-8"
|
ARG LANGUAGE="en_US.UTF-8"
|
||||||
ARG TIMEZONE="America/New_York"
|
ARG TIMEZONE="America/New_York"
|
||||||
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
|
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -5,7 +5,7 @@ ARG PHP_SERVER="alpine"
|
|||||||
ARG BUILD_DATE="202408111050"
|
ARG BUILD_DATE="202408111050"
|
||||||
ARG LANGUAGE="en_US.UTF-8"
|
ARG LANGUAGE="en_US.UTF-8"
|
||||||
ARG TIMEZONE="America/New_York"
|
ARG TIMEZONE="America/New_York"
|
||||||
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
|
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -5,7 +5,7 @@ ARG PHP_SERVER="alpine"
|
|||||||
ARG BUILD_DATE="202408111050"
|
ARG BUILD_DATE="202408111050"
|
||||||
ARG LANGUAGE="en_US.UTF-8"
|
ARG LANGUAGE="en_US.UTF-8"
|
||||||
ARG TIMEZONE="America/New_York"
|
ARG TIMEZONE="America/New_York"
|
||||||
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
|
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -5,7 +5,7 @@ ARG PHP_SERVER="alpine"
|
|||||||
ARG BUILD_DATE="202408111050"
|
ARG BUILD_DATE="202408111050"
|
||||||
ARG LANGUAGE="en_US.UTF-8"
|
ARG LANGUAGE="en_US.UTF-8"
|
||||||
ARG TIMEZONE="America/New_York"
|
ARG TIMEZONE="America/New_York"
|
||||||
ARG WWW_ROOT_DIR="/usr/share/httpd/default"
|
ARG WWW_ROOT_DIR="/usr/local/share/httpd/default"
|
||||||
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
ARG DEFAULT_FILE_DIR="/usr/local/share/template-files"
|
||||||
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data"
|
||||||
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
ARG DEFAULT_CONF_DIR="/usr/local/share/template-files/config"
|
||||||
|
@ -192,9 +192,9 @@ __certbot() {
|
|||||||
fi
|
fi
|
||||||
statusCode=$?
|
statusCode=$?
|
||||||
else
|
else
|
||||||
certbot_key_opts="$certbot_key_opts --webroot ${WWW_ROOT_DIR:-/usr/share/httpd/default}"
|
certbot_key_opts="$certbot_key_opts --webroot ${WWW_ROOT_DIR:-/usr/local/share/httpd/default}"
|
||||||
if [ -n "$ADD_CERTBOT_DOMAINS" ]; then
|
if [ -n "$ADD_CERTBOT_DOMAINS" ]; then
|
||||||
certbot $options --agree-tos -m $CERT_BOT_MAIL certonly --webroot "${WWW_ROOT_DIR:-/usr/share/httpd/default}" $certbot_key_opts
|
certbot $options --agree-tos -m $CERT_BOT_MAIL certonly --webroot "${WWW_ROOT_DIR:-/usr/local/share/httpd/default}" $certbot_key_opts
|
||||||
statusCode=$?
|
statusCode=$?
|
||||||
else
|
else
|
||||||
statusCode=1
|
statusCode=1
|
||||||
@ -793,11 +793,11 @@ EOF
|
|||||||
}
|
}
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
__initialize_web_health() {
|
__initialize_web_health() {
|
||||||
local www_dir="${1:-${WWW_ROOT_DIR:-/usr/share/httpd/default}}"
|
local www_dir="${1:-${WWW_ROOT_DIR:-/usr/local/share/httpd/default}}"
|
||||||
if [ -d "$www_dir" ]; then
|
if [ -d "$www_dir" ]; then
|
||||||
__find_replace "REPLACE_CONTAINER_IP4" "${REPLACE_CONTAINER_IP4:-127.0.0.1}" "/usr/share/httpd"
|
__find_replace "REPLACE_CONTAINER_IP4" "${REPLACE_CONTAINER_IP4:-127.0.0.1}" "/usr/local/share/httpd"
|
||||||
__find_replace "REPLACE_COPYRIGHT_FOOTER" "${COPYRIGHT_FOOTER:-Copyright 1999 - $(date +'%Y')}" "/usr/share/httpd"
|
__find_replace "REPLACE_COPYRIGHT_FOOTER" "${COPYRIGHT_FOOTER:-Copyright 1999 - $(date +'%Y')}" "/usr/local/share/httpd"
|
||||||
__find_replace "REPLACE_LAST_UPDATED_ON_MESSAGE" "${LAST_UPDATED_ON_MESSAGE:-$(date +'Last updated on: %Y-%m-%d at %H:%M:%S')}" "/usr/share/httpd"
|
__find_replace "REPLACE_LAST_UPDATED_ON_MESSAGE" "${LAST_UPDATED_ON_MESSAGE:-$(date +'Last updated on: %Y-%m-%d at %H:%M:%S')}" "/usr/local/share/httpd"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
@ -833,7 +833,7 @@ __initialize_replace_variables() {
|
|||||||
[ -n "$SERVICE_PORT" ] && __find_replace "REPLACE_SERVER_PORT" "${SERVICE_PORT:-80}" "$set_dir"
|
[ -n "$SERVICE_PORT" ] && __find_replace "REPLACE_SERVER_PORT" "${SERVICE_PORT:-80}" "$set_dir"
|
||||||
[ -n "$HOSTNAME" ] && __find_replace "REPLACE_SERVER_NAME" "${FULL_DOMAIN_NAME:-$HOSTNAME}" "$set_dir"
|
[ -n "$HOSTNAME" ] && __find_replace "REPLACE_SERVER_NAME" "${FULL_DOMAIN_NAME:-$HOSTNAME}" "$set_dir"
|
||||||
[ -n "$CONTAINER_NAME" ] && __find_replace "REPLACE_SERVER_SOFTWARE" "${CONTAINER_NAME:-docker}" "$set_dir"
|
[ -n "$CONTAINER_NAME" ] && __find_replace "REPLACE_SERVER_SOFTWARE" "${CONTAINER_NAME:-docker}" "$set_dir"
|
||||||
[ -n "$WWW_ROOT_DIR" ] && __find_replace "REPLACE_SERVER_WWW_DIR" "${WWW_ROOT_DIR:-/usr/share/httpd/default}" "$set_dir"
|
[ -n "$WWW_ROOT_DIR" ] && __find_replace "REPLACE_SERVER_WWW_DIR" "${WWW_ROOT_DIR:-/usr/local/share/httpd/default}" "$set_dir"
|
||||||
done
|
done
|
||||||
if [ -n "$WWW_ROOT_DIR" ] && [ "$set_dir" != "$WWW_ROOT_DIR" ] && [ -d "$WWW_ROOT_DIR" ]; then
|
if [ -n "$WWW_ROOT_DIR" ] && [ "$set_dir" != "$WWW_ROOT_DIR" ] && [ -d "$WWW_ROOT_DIR" ]; then
|
||||||
__find_replace "REPLACE_CONTAINER_IP4" "${REPLACE_CONTAINER_IP4:-127.0.0.1}" "$WWW_ROOT_DIR"
|
__find_replace "REPLACE_CONTAINER_IP4" "${REPLACE_CONTAINER_IP4:-127.0.0.1}" "$WWW_ROOT_DIR"
|
||||||
@ -996,7 +996,7 @@ __initialize_data_dir() {
|
|||||||
__initialize_www_root() {
|
__initialize_www_root() {
|
||||||
local WWW_INIT=""
|
local WWW_INIT=""
|
||||||
local WWW_TEMPLATE=""
|
local WWW_TEMPLATE=""
|
||||||
[ -d "/usr/share/httpd/default" ] && WWW_TEMPLATE="/usr/share/httpd/default"
|
[ -d "/usr/local/share/httpd/default" ] && WWW_TEMPLATE="/usr/local/share/httpd/default"
|
||||||
[ "$WWW_ROOT_DIR" = "/app" ] && WWW_INIT="${WWW_INIT:-true}"
|
[ "$WWW_ROOT_DIR" = "/app" ] && WWW_INIT="${WWW_INIT:-true}"
|
||||||
[ "$WWW_ROOT_DIR" = "/data/htdocs" ] && WWW_INIT="${WWW_INIT:-true}"
|
[ "$WWW_ROOT_DIR" = "/data/htdocs" ] && WWW_INIT="${WWW_INIT:-true}"
|
||||||
__is_dir_empty "$WWW_ROOT_DIR/" && WWW_INIT="true" || WWW_INIT="false"
|
__is_dir_empty "$WWW_ROOT_DIR/" && WWW_INIT="true" || WWW_INIT="false"
|
||||||
@ -1030,7 +1030,7 @@ __is_htdocs_mounted() {
|
|||||||
WWW_ROOT_DIR="/data/wwwroot"
|
WWW_ROOT_DIR="/data/wwwroot"
|
||||||
fi
|
fi
|
||||||
[ -d "$WWW_ROOT_DIR" ] || mkdir -p "$WWW_ROOT_DIR"
|
[ -d "$WWW_ROOT_DIR" ] || mkdir -p "$WWW_ROOT_DIR"
|
||||||
export WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}"
|
export WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/local/share/httpd/default}"
|
||||||
}
|
}
|
||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
__initialize_ssl_certs() {
|
__initialize_ssl_certs() {
|
||||||
@ -1062,11 +1062,11 @@ __initialize_ssl_certs() {
|
|||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
__start_php_dev_server() {
|
__start_php_dev_server() {
|
||||||
if [ "$2" = "yes" ]; then
|
if [ "$2" = "yes" ]; then
|
||||||
if [ -d "/usr/share/httpd" ]; then
|
if [ -d "/usr/local/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
|
find "/usr/local/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"
|
php -S 0.0.0.0:$PHP_DEV_SERVER_PORT -t "/usr/local/share/httpd"
|
||||||
fi
|
fi
|
||||||
if ! echo "$1" | grep -q "^/usr/share/httpd"; then
|
if ! echo "$1" | grep -q "^/usr/local/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
|
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"
|
php -S 0.0.0.0:$PHP_DEV_SERVER_PORT -t "$1"
|
||||||
fi
|
fi
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||||
# directory settings
|
# directory settings
|
||||||
#BACKUP_DIR="${BACKUP_DIR:-/data/backups}"
|
#BACKUP_DIR="${BACKUP_DIR:-/data/backups}"
|
||||||
#WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/share/httpd/default}"
|
#WWW_ROOT_DIR="${WWW_ROOT_DIR:-/usr/local/share/httpd/default}"
|
||||||
#LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}"
|
#LOCAL_BIN_DIR="${LOCAL_BIN_DIR:-/usr/local/bin}"
|
||||||
#DATABASE_BASE_DIR="${DATABASE_BASE_DIR:-/data/db}"
|
#DATABASE_BASE_DIR="${DATABASE_BASE_DIR:-/data/db}"
|
||||||
#DEFAULT_DATA_DIR="${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}"
|
#DEFAULT_DATA_DIR="${DEFAULT_DATA_DIR:-/usr/local/share/template-files/data}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user