From a075a20d73bf03f9b6e5b15d67890b46847d5148 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 30 Jan 2022 13:50:48 +0100 Subject: [PATCH 1/2] Ensure to evaluate MASS_VHOST_SSL_GEN env var --- README.md | 2 +- data/docker-entrypoint.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 005b8a7..62ed248 100644 --- a/README.md +++ b/README.md @@ -265,7 +265,7 @@ It allows any of the following combinations: ``` Server version: Apache/2.4.52 (Unix) -Server built: Dec 21 2021 01:34:45 +Server built: Jan 26 2022 08:37:13 Server's Module Magic Number: 20120211:121 Server loaded: APR 1.7.0, APR-UTIL 1.6.1 Compiled using: APR 1.7.0, APR-UTIL 1.6.1 diff --git a/data/docker-entrypoint.sh b/data/docker-entrypoint.sh index a82d989..bc256e3 100755 --- a/data/docker-entrypoint.sh +++ b/data/docker-entrypoint.sh @@ -244,7 +244,7 @@ if [ "${MASS_VHOST_ENABLE}" -eq "1" ]; then fi # Create watcherd sub commands - watcherd_add="create-vhost.sh '%%p' '%%n' '${MASS_VHOST_TLD}' '%%p/${MASS_VHOST_TPL}/' '${CA_KEY}' '${CA_CRT}' '1' '${MASS_VHOST_SSL_TYPE}' '${verbose}'" + watcherd_add="create-vhost.sh '%%p' '%%n' '${MASS_VHOST_TLD}' '%%p/${MASS_VHOST_TPL}/' '${CA_KEY}' '${CA_CRT}' '${MASS_VHOST_SSL_GEN}' '${MASS_VHOST_SSL_TYPE}' '${verbose}'" watcherd_del="rm /etc/httpd/vhost.d/%%n.conf" watcherd_tri="${HTTPD_RELOAD}" From b0a51fd5027db1f70ededc6b50b04e704ac5f7d0 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 30 Jan 2022 13:53:10 +0100 Subject: [PATCH 2/2] Update nightly tag --- .github/workflows/nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 519ebf8..8858bb4 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -27,7 +27,7 @@ jobs: matrix: refs: - 'master' - - '0.38' + - '0.39' steps: # ------------------------------------------------------------