From 511f5c09c05c77936cffd06bca5fb3f0e28a7f7a Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Thu, 7 Feb 2019 13:57:20 -0800 Subject: [PATCH] apache: Cleanup domain configuration - Don't set log level explicitly. Fallback to value set in global Apache configuration. - Don't set directory options already set in global configuration. - Remove /cgi-bin/. Only ikiwiki uses cgi and it is served from a different path than /usr/lib/cgi-bin. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- .../freedombox-tls-site-macro.conf | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf b/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf index 9b3752d8b..b4d93b22c 100644 --- a/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf +++ b/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf @@ -4,24 +4,10 @@ ServerAdmin webmaster@localhost ServerName $domain DocumentRoot /var/www/html - - Options FollowSymLinks - AllowOverride None - - - Options Indexes FollowSymLinks MultiViews - AllowOverride None - - ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ - - AllowOverride None - Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch - + ErrorLog ${APACHE_LOG_DIR}/error.log - # Possible values include: debug, info, notice, warn, error, crit, alert, emerg. - LogLevel warn CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined - # GnuTLS Switch: Enable/Disable SSL/TLS for this virtual host. + GnuTLSEnable On # Automatically obtained certificates from Let's Encrypt GnuTLSCertificateFile /etc/letsencrypt/live/$domain/fullchain.pem