From b29f1ab42e1da8be9fd94e6e3521e234b73a3ff5 Mon Sep 17 00:00:00 2001
From: root <holta@users.noreply.github.com>
Date: Sun, 16 Feb 2020 21:00:32 -0500
Subject: [PATCH] Clean out bitrot

---
 roles/nextcloud/tasks/setup.yml             |  3 +-
 roles/nextcloud/templates/nextcloud.conf.j2 | 36 ---------------------
 2 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/roles/nextcloud/tasks/setup.yml b/roles/nextcloud/tasks/setup.yml
index 7688e3e66..dbede553e 100644
--- a/roles/nextcloud/tasks/setup.yml
+++ b/roles/nextcloud/tasks/setup.yml
@@ -18,10 +18,9 @@
 - name: Create data dir {{ nextcloud_data_dir }}
   file:
     state: directory
-    path: "{{ nextcloud_data_dir }}"    # /library/nextcloud/data NOT USED BY NEXTCLOUD AS OF 2020-02-15 ...Nextcloud defaults to /opt/nextcloud/data OR /library/www/html/nextcloud/data ??
+    path: "{{ nextcloud_data_dir }}"    # /library/www/nextcloud/data
     owner: "{{ apache_user }}"
     group: "{{ apache_user }}"
-    # mode: '0750'
 
 # 1 of 3: Very Old Way... from OwnCloud days
 #- name: Install {{ nextcloud_root_dir }}/config/autoconfig.php from template
diff --git a/roles/nextcloud/templates/nextcloud.conf.j2 b/roles/nextcloud/templates/nextcloud.conf.j2
index 6d742da74..7f36683c3 100644
--- a/roles/nextcloud/templates/nextcloud.conf.j2
+++ b/roles/nextcloud/templates/nextcloud.conf.j2
@@ -1,12 +1,8 @@
 # Ansible template that becomes /etc/apache2/sites-available/nextcloud.conf
 
 Alias {{ nextcloud_url }} {{ nextcloud_root_dir }}
-# Alias {{ nextcloud_url }} [[ nextcloud_prefix ]]/nextcloud
 
 <Directory {{ nextcloud_root_dir }}/>
-# <Directory [[ nextcloud_prefix ]]/nextcloud/>
-    # 2019-09-04 commenting out towards future removal
-    #Options -Indexes
 
     Options +FollowSymlinks
     AllowOverride All
@@ -15,9 +11,6 @@ Alias {{ nextcloud_url }} {{ nextcloud_root_dir }}
     # Apache 2.4
     # http://httpd.apache.org/docs/2.4/mod/mod_authz_core.html
 
-    # 2019-09-04 commenting out towards future removal
-    #Require host localhost
-
 {% if True %}    {# 2020-02-15: Condition WAS... nextcloud_allow_public_ips #}
     # PERMIT ACCESS FROM ALL IPv4 ADDRESSES:
     Require all granted
@@ -34,33 +27,4 @@ Alias {{ nextcloud_url }} {{ nextcloud_root_dir }}
     #Require ip 127.0.0.1 {{ lan_ip }}/{{ lan_netmask }} {{ nextcloud_required_ip }} {{ openvpn_server_virtual_ip }}/255.255.255.0
     </IfModule>
     
-    # 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>