From c2d9a3786f4eee7058a0a6ca8291eaa085546a57 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Thu, 6 Feb 2020 00:01:26 -0600
Subject: [PATCH] Correct some Apache configs

---
 roles/nextcloud/templates/apache2-vhost-ssl.conf | 10 ++++++++++
 roles/nextcloud/templates/apache2-vhost.conf     |  8 +++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/roles/nextcloud/templates/apache2-vhost-ssl.conf b/roles/nextcloud/templates/apache2-vhost-ssl.conf
index f8677c1..311d337 100644
--- a/roles/nextcloud/templates/apache2-vhost-ssl.conf
+++ b/roles/nextcloud/templates/apache2-vhost-ssl.conf
@@ -13,6 +13,11 @@ SSLStrictSNIVHostCheck off
 	# Leaving it off for now for testing
 	#Redirect permanent / https://{{ nextcloud_url }}
 	DocumentRoot {{ nextcloud_webroot }}
+	<Directory "{{ nextcloud_webroot }}">
+		Require all granted
+		AllowOverride All
+		Options MultiViews FollowSymlinks
+	</Directory>
 </VirtualHost>
 <VirtualHost *:443>
 	SSLEngine on
@@ -26,4 +31,9 @@ SSLStrictSNIVHostCheck off
 	</Directory>
 	ServerName {{ nextcloud_url }}
 	DocumentRoot {{ nextcloud_webroot }}
+	<Directory "{{ nextcloud_webroot }}">
+		Require all granted
+		AllowOverride All
+		Options MultiViews FollowSymlinks
+	</Directory>
 </VirtualHost>
diff --git a/roles/nextcloud/templates/apache2-vhost.conf b/roles/nextcloud/templates/apache2-vhost.conf
index db27ba6..ae4c64b 100644
--- a/roles/nextcloud/templates/apache2-vhost.conf
+++ b/roles/nextcloud/templates/apache2-vhost.conf
@@ -4,8 +4,10 @@
 # Website configuration
 <VirtualHost *:80>
 	ServerName {{ nextcloud_url }}
-	# Uncomment me for HTTPS redirection
-	# Leaving it off for now for testing
-	#Redirect permanent / https://{{ nextcloud_url }}
 	DocumentRoot {{ nextcloud_webroot }}
+	<Directory "{{ nextcloud_webroot }}">
+		Require all granted
+		AllowOverride All
+		Options MultiViews FollowSymlinks
+	</Directory>
 </VirtualHost>