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 168dec448..9f8389408 100644 --- a/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf +++ b/data/etc/apache2/conf-available/freedombox-tls-site-macro.conf @@ -1,25 +1,5 @@ - # mod_gnutls default options. See /etc/apache2/sites-available/default-tls.conf - - - ServerAdmin webmaster@localhost - ServerName $domain - DocumentRoot /var/www/html - - ErrorLog ${APACHE_LOG_DIR}/error.log - CustomLog ${APACHE_LOG_DIR}/ssl_access.log combined - - GnuTLSEnable On - - # Automatically obtained certificates from Let's Encrypt - GnuTLSCertificateFile /etc/letsencrypt/live/$domain/fullchain.pem - GnuTLSKeyFile /etc/letsencrypt/live/$domain/privkey.pem - # See http://www.outoforder.cc/projects/httpd/mod_gnutls/docs/#GnuTLSPriorities - GnuTLSPriorities NORMAL:-VERS-SSL3.0:-VERS-TLS1.0:-VERS-TLS1.1 - - - # mod_ssl default options. See /etc/apache2/sites-available/default-ssl.conf diff --git a/data/etc/apache2/sites-available/plinth-ssl.conf b/data/etc/apache2/sites-available/plinth-ssl.conf index 0b8a9a627..a7831936c 100644 --- a/data/etc/apache2/sites-available/plinth-ssl.conf +++ b/data/etc/apache2/sites-available/plinth-ssl.conf @@ -6,7 +6,7 @@ ## ## Requires the following Apache modules to be enabled: ## mod_rewrite -## mod_ssl or mod_gnutls +## mod_ssl ## RewriteEngine on