diff --git a/docker/apache/000-default.conf b/docker/apache/000-default.conf index ffbd8fa..03bf25d 100644 --- a/docker/apache/000-default.conf +++ b/docker/apache/000-default.conf @@ -37,32 +37,12 @@ # Subdomain: jumpers.stormcloudhills.com -> /uploads/scj -# HTTP: redirect everything to HTTPS ServerName jumpers.stormcloudhills.com ServerAdmin webmaster@alwisp.net - - RewriteEngine On - RewriteRule ^/?(.*)$ https://jumpers.stormcloudhills.com/$1 [R=301,L] - - ErrorLog ${APACHE_LOG_DIR}/jumpers-error.log - CustomLog ${APACHE_LOG_DIR}/jumpers-access.log combined - - -# HTTPS - - - ServerName jumpers.stormcloudhills.com - ServerAdmin webmaster@alwisp.net DocumentRoot /var/www/html/uploads/scj DirectoryIndex index.html - SSLEngine on - SSLCertificateFile /etc/apache2/ssl/jumpers.stormcloudhills.com.crt - SSLCertificateKeyFile /etc/apache2/ssl/jumpers.stormcloudhills.com.key - # If your provider gives a separate CA chain/bundle, uncomment: - #SSLCertificateChainFile /etc/apache2/ssl/jumpers.stormcloudhills.com.chain.crt - Options -Indexes +FollowSymLinks AllowOverride All @@ -70,7 +50,6 @@ # Security headers - Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains" Header always set X-Frame-Options "SAMEORIGIN" Header always set X-Content-Type-Options "nosniff" Header always set X-XSS-Protection "1; mode=block" @@ -92,7 +71,6 @@ ExpiresByType application/javascript "access plus 1 week" - ErrorLog ${APACHE_LOG_DIR}/jumpers-ssl-error.log - CustomLog ${APACHE_LOG_DIR}/jumpers-ssl-access.log combined + ErrorLog ${APACHE_LOG_DIR}/jumpers-error.log + CustomLog ${APACHE_LOG_DIR}/jumpers-access.log combined -