From 92d453a7c3d8be1ccc76c1fbfad34911527a9bba Mon Sep 17 00:00:00 2001
From: A Holt <holta@users.noreply.github.com>
Date: Wed, 4 Sep 2019 17:49:20 -0400
Subject: [PATCH] Mark+deprecate ancient code for future removal?

---
 roles/nextcloud/templates/nextcloud.conf.j2 | 62 +++++++++++----------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/roles/nextcloud/templates/nextcloud.conf.j2 b/roles/nextcloud/templates/nextcloud.conf.j2
index 2d0f43e41..6a575d0a1 100644
--- a/roles/nextcloud/templates/nextcloud.conf.j2
+++ b/roles/nextcloud/templates/nextcloud.conf.j2
@@ -3,7 +3,10 @@
 Alias {{ nextcloud_url }} {{ nextcloud_prefix }}/nextcloud
 
 <Directory {{ nextcloud_prefix }}/nextcloud/>
-    Options -Indexes
+    # 2019-09-04 commenting out towards future removal
+    #Options -Indexes
+
+    Options +FollowSymlinks
     AllowOverride All
 
     <IfModule mod_authz_core.c>
@@ -25,31 +28,34 @@ Alias {{ nextcloud_url }} {{ nextcloud_prefix }}/nextcloud
     # AVOID THIS LINE AS IT OVERLY RESTRICTS SCHOOLS W/ 192.168.1.x, 10.x.y.z:
     #Require ip 127.0.0.1 {{ lan_ip }}/{{ lan_netmask }} {{ nextcloud_required_ip }} {{ openvpn_server_virtual_ip }}/255.255.255.0
     </IfModule>
-    <IfModule !mod_authz_core.c>
-    # Apache 2.2
-    Order Deny,Allow
-    Deny from all
-    Allow from 127.0.0.1
-    Allow from ::1
-    </IfModule>
-
-    ErrorDocument 404 /core/templates/404.php
-
-    <IfModule mod_php5.c>
-    php_value upload_max_filesize 512M
-    php_value post_max_size 512M
-    php_value memory_limit 512M
-    php_value mbstring.func_overload 0
-    </IfModule>
-
-    SetEnv htaccessWorking true
-
-    <IfModule pagespeed_module>
-    ModPagespeed Off
-    </IfModule>
-
-    RewriteEngine on
-    RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]
-    RewriteRule ^\.well-known/carddav /remote.php/carddav/ [R]
-    RewriteRule ^\.well-known/caldav /remote.php/caldav/ [R]
+    
+    # 2019-09-04 commenting out towards future removal
+    #<IfModule !mod_authz_core.c>
+    ## Apache 2.2
+    #Order Deny,Allow
+    #Deny from all
+    #Allow from 127.0.0.1
+    #Allow from ::1
+    #</IfModule>
+    #
+    #ErrorDocument 404 /core/templates/404.php
+    #
+    # 2019-09-04 commenting out towards future removal
+    #<IfModule mod_php5.c>
+    #php_value upload_max_filesize 512M
+    #php_value post_max_size 512M
+    #php_value memory_limit 512M
+    #php_value mbstring.func_overload 0
+    #</IfModule>
+    #
+    #SetEnv htaccessWorking true
+    #
+    #<IfModule pagespeed_module>
+    #ModPagespeed Off
+    #</IfModule>
+    #
+    #RewriteEngine on
+    #RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]
+    #RewriteRule ^\.well-known/carddav /remote.php/carddav/ [R]
+    #RewriteRule ^\.well-known/caldav /remote.php/caldav/ [R]
 </Directory>