summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2020-10-11 18:24:25 +0200
committerJonas Smedegaard <dr@jones.dk>2020-10-11 18:24:25 +0200
commit5cfbab9215b5ad519150ff2bd5908971cbb7f7d4 (patch)
treebe1d65bd5a82f2af9e2f48a86ff27891d54a552a
parente45dc7603fb6b51a1616b0ff7c875ca24278d9b4 (diff)
use mod_gnutls when available (not mod_ssl)
-rw-r--r--apache2/conf-available/local-ssl.conf32
1 files changed, 21 insertions, 11 deletions
diff --git a/apache2/conf-available/local-ssl.conf b/apache2/conf-available/local-ssl.conf
index 3548264..8e30d50 100644
--- a/apache2/conf-available/local-ssl.conf
+++ b/apache2/conf-available/local-ssl.conf
@@ -14,15 +14,25 @@
RedirectMatch permanent ^(?!/.well-known/)(.*) https://${_HOST}/$1
</If>
-SSLEngine on
-<IfDefine _TLS_KEY>
- SSLCertificateFile ${_TLS_CERT_CHAIN}
- SSLCertificateKeyFile ${_TLS_KEY}
-</IfDefine>
+<IfModule mod_gnutls.c>
+ GnuTLSEnable on
+ <IfDefine _TLS_KEY>
+ GnuTLSCertificateFile ${_TLS_CERT_CHAIN}
+ GnuTLSKeyFile ${_TLS_KEY}
+ </IfDefine>
+</IfModule>
+
+<IfModule !mod_gnutls.c>
+ SSLEngine on
+ <IfDefine _TLS_KEY>
+ SSLCertificateFile ${_TLS_CERT_CHAIN}
+ SSLCertificateKeyFile ${_TLS_KEY}
+ </IfDefine>
-<FilesMatch "\.(cgi|shtml|phtml|php)$">
- SSLOptions +StdEnvVars
-</FilesMatch>
-<Directory /usr/lib/cgi-bin>
- SSLOptions +StdEnvVars
-</Directory>
+ <FilesMatch "\.(cgi|shtml|phtml|php)$">
+ SSLOptions +StdEnvVars
+ </FilesMatch>
+ <Directory /usr/lib/cgi-bin>
+ SSLOptions +StdEnvVars
+ </Directory>
+</IfModule>