From 88f6d04f899766757d2329affcfd00e18058d0b7 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Thu, 21 Jun 2018 18:28:10 +0200
Subject: [PATCH] [fix] options now force + or - everywhere

---
 etc/alternc/templates/alternc/apache2.conf          | 6 +++---
 etc/alternc/templates/apache2/roundcube-ssl.conf    | 4 ++--
 etc/alternc/templates/apache2/squirrelmail-ssl.conf | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/etc/alternc/templates/alternc/apache2.conf b/etc/alternc/templates/alternc/apache2.conf
index 7fb527e6..f82ff629 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/etc/alternc/templates/apache2/roundcube-ssl.conf b/etc/alternc/templates/apache2/roundcube-ssl.conf
index 8e5e5e2f..44f3b756 100644
--- a/etc/alternc/templates/apache2/roundcube-ssl.conf
+++ b/etc/alternc/templates/apache2/roundcube-ssl.conf
@@ -19,7 +19,7 @@
 
   # Access to tinymce files
   <Directory "/usr/share/tinymce/www/">
-        Options Indexes MultiViews FollowSymLinks
+        Options +Indexes +MultiViews +FollowSymLinks
         AllowOverride None
         Order allow,deny
         allow from all
@@ -57,7 +57,7 @@
   Alias /javascript /usr/share/javascript/
 
   <Directory "/usr/share/javascript/">
-        Options FollowSymLinks MultiViews
+        Options +FollowSymLinks +MultiViews
         Order allow,deny
         Allow from all
   </Directory>
diff --git a/etc/alternc/templates/apache2/squirrelmail-ssl.conf b/etc/alternc/templates/apache2/squirrelmail-ssl.conf
index a67b8837..f5132599 100644
--- a/etc/alternc/templates/apache2/squirrelmail-ssl.conf
+++ b/etc/alternc/templates/apache2/squirrelmail-ssl.conf
@@ -19,13 +19,13 @@
   <Directory /usr/share/squirrelmail>
     php_value open_basedir /usr/share/squirrelmail:/etc/squirrelmail/:/var/lib/squirrelmail/data/:/var/spool/squirrelmail/:/etc/mailname
     php_admin_flag safe_mode off
-    Options Indexes FollowSymLinks
+    Options +Indexes +FollowSymLinks
   </Directory>
 
   Alias /javascript /usr/share/javascript/
 
   <Directory "/usr/share/javascript/">
-        Options FollowSymLinks MultiViews
+        Options +FollowSymLinks +MultiViews
         Order allow,deny
         Allow from all
   </Directory>