diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2020-10-13 00:26:56 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2020-10-13 00:26:56 +0200 |
| commit | 4eb605d0fbeab888dee9ca86a62bd2501300bc69 (patch) | |
| tree | b58f1f443ed0881d932144586c2353d539908026 | |
| parent | 6bc86ae316eb9800eddfd02fa4969e2e9655a51d (diff) | |
fix undefine all defined variables
| -rw-r--r-- | apache2/conf-available/local-ssl.conf | 16 | ||||
| -rw-r--r-- | apache2/sites-available/0_default.conf | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/apache2/conf-available/local-ssl.conf b/apache2/conf-available/local-ssl.conf index e35e9ca..83acb90 100644 --- a/apache2/conf-available/local-ssl.conf +++ b/apache2/conf-available/local-ssl.conf @@ -1,10 +1,13 @@ <IfDefine !_TLSHOST> <IfDefine _HOST> + Define __TLSHOST Define _TLSHOST ${_HOST} </IfDefine> </IfDefine> <IfDefine !_TLS_KEY> <IfDefine _TLSHOST> + Define __TLS_CERT_CHAIN + Define __TLS_KEY Define _TLS_CERT_CHAIN /var/lib/dehydrated/certs/${_TLSHOST}/fullchain.pem Define _TLS_KEY /var/lib/dehydrated/certs/${_TLSHOST}/privkey.pem </IfDefine> @@ -60,3 +63,16 @@ </IfModule> </IfDefine> + +<IfDefine __TLSHOST> + Undefine _TLSHOST + Undefine __TLSHOST +</IfDefine> +<IfDefine __TLS_CERT_CHAIN> + Undefine _TLS_CERT_CHAIN + Undefine __TLS_CERT_CHAIN +</IfDefine> +<IfDefine __TLS_KEY> + Undefine _TLS_KEY + Undefine __TLS_KEY +</IfDefine> diff --git a/apache2/sites-available/0_default.conf b/apache2/sites-available/0_default.conf index 80532e5..9ab8c5d 100644 --- a/apache2/sites-available/0_default.conf +++ b/apache2/sites-available/0_default.conf @@ -18,5 +18,6 @@ Define _TLS_KEY /etc/ssl/private/ssl-cert-snakeoil.key CustomLog ${APACHE_LOG_DIR}/access.log combined </VirtualHost> +Undefine _TLS_HOST Undefine _TLS_CERT_CHAIN Undefine _TLS_KEY |