From ed3401404f70b540c99702b3250dc2c16e490ebb Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Tue, 12 Jun 2018 19:35:14 -0400
Subject: [PATCH] Cherrypick apache2 configuration for jessie/stretch

Sourced from https://github.com/fser/AlternC/commit/ea3371ae3489c254523ca7af9c87a03dc27431c4
---
 etc/alternc/templates/alternc/apache2.conf | 6 +++---
 ssl/ssl.conf                               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/alternc/templates/alternc/apache2.conf b/etc/alternc/templates/alternc/apache2.conf
index 0732de07..bcfe3bcd 100644
--- a/etc/alternc/templates/alternc/apache2.conf
+++ b/etc/alternc/templates/alternc/apache2.conf
@@ -11,7 +11,7 @@ AssignUserId www-data www-data
 
 # Deny access to the root filesystem
 <Directory />
-  Options +FollowSymLinks
+  Options FollowSymLinks
   AllowOverride None
   Order allow,deny
   Deny from all
@@ -62,13 +62,13 @@ ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 
 <Directory /usr/share/phpmyadmin>
   AllowOverride AuthConfig Options FileInfo Limit Indexes
-  Options +Indexes +Includes +FollowSymLinks +MultiViews
+  Options Indexes Includes FollowSymLinks MultiViews
   Order allow,deny
   Allow from all
 </Directory>
 <Directory /usr/share/squirrelmail>
   AllowOverride AuthConfig Options FileInfo Limit Indexes
-  Options +Indexes +Includes +FollowSymLinks +MultiViews
+  Options Indexes Includes FollowSymLinks MultiViews
   Order allow,deny
   Allow from all
 </Directory>
diff --git a/ssl/ssl.conf b/ssl/ssl.conf
index 68b422b3..2ff7532c 100644
--- a/ssl/ssl.conf
+++ b/ssl/ssl.conf
@@ -51,7 +51,7 @@ SSLSessionCacheTimeout  300
 #   Semaphore:
 #   Configure the path to the mutual exclusion semaphore the
 #   SSL engine uses internally for inter-process synchronization. 
-Mutex  file:${APACHE_RUN_DIR}
+#SSLMutex  file:${APACHE_RUN_DIR}/ssl_mutex
 
 #   SSL Cipher Suite:
 #   List the ciphers that the client is permitted to negotiate. See the