From 5df6d1178b07703bfa675acb16a8ab9621c67552 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Thu, 12 Jul 2018 12:14:12 -0400
Subject: [PATCH 1/3] Normalize spacing in roundcube vhost template

---
 roundcube/templates/apache2/roundcube.conf | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/roundcube/templates/apache2/roundcube.conf b/roundcube/templates/apache2/roundcube.conf
index cfa83db1..16911008 100644
--- a/roundcube/templates/apache2/roundcube.conf
+++ b/roundcube/templates/apache2/roundcube.conf
@@ -20,9 +20,9 @@
 
   # Access to tinymce files
   <Directory "/usr/share/tinymce/www/">
-        Options +Indexes +MultiViews +FollowSymLinks
-        AllowOverride None
-  	Require all granted
+    Options +Indexes +MultiViews +FollowSymLinks
+    AllowOverride None
+    Require all granted
   </Directory>
 
   <Directory /var/lib/roundcube/>
@@ -56,8 +56,8 @@
   Alias /javascript /usr/share/javascript/
 
   <Directory "/usr/share/javascript/">
-        Options +FollowSymLinks +MultiViews
-  	Require all granted
+    Options +FollowSymLinks +MultiViews
+    Require all granted
   </Directory>
 
   SSLEngine On

From 6b1cf6fa45e2a49c84b24b95e8fc166536a218ba Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Thu, 12 Jul 2018 12:14:27 -0400
Subject: [PATCH 2/3] Update roundcube vhost template to apache 2.4

---
 roundcube/templates/apache2/roundcube.conf | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/roundcube/templates/apache2/roundcube.conf b/roundcube/templates/apache2/roundcube.conf
index 16911008..a72c65f6 100644
--- a/roundcube/templates/apache2/roundcube.conf
+++ b/roundcube/templates/apache2/roundcube.conf
@@ -37,20 +37,19 @@
   <Directory /var/lib/roundcube/config>
     Options -FollowSymLinks
     AllowOverride None
+    Require all denied
   </Directory>
 
   <Directory /var/lib/roundcube/temp>
     Options -FollowSymLinks
     AllowOverride None
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Directory>
 
   <Directory /var/lib/roundcube/logs>
     Options -FollowSymLinks
     AllowOverride None
-    Order allow,deny
-    Deny from all
+    Require all denied
   </Directory>
 
   Alias /javascript /usr/share/javascript/

From 72a3acab58469223c4843220d0723cded8924e60 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kienan.stewart@burntworld.ca>
Date: Thu, 12 Jul 2018 12:21:55 -0400
Subject: [PATCH 3/3] Remove last vestiges of alternc-roundcube user

---
 debian/alternc-roundcube.postinst | 5 -----
 roundcube/roundcube-install       | 9 ++++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/alternc-roundcube.postinst b/debian/alternc-roundcube.postinst
index 0d99169d..3acb05bf 100644
--- a/debian/alternc-roundcube.postinst
+++ b/debian/alternc-roundcube.postinst
@@ -11,11 +11,6 @@ LOGROTATE="/etc/logrotate.d/roundcube-core"
 case "$1" in
     configure)
 	
-        # add alternc-roundcube user for php-itk special rights
-	if ! getent passwd alternc-roundcube; then
-	    useradd -g nogroup -u 1996 alternc-roundcube -d /usr/share/roundcube
-	fi
-
 	# removed from 3.1 & 3.2 :
 	dpkg-statoverride --list /var/lib/roundcube/temp >/dev/null &&  
 	dpkg-statoverride --remove /var/lib/roundcube/temp
diff --git a/roundcube/roundcube-install b/roundcube/roundcube-install
index 4e9149b3..8f8cada6 100644
--- a/roundcube/roundcube-install
+++ b/roundcube/roundcube-install
@@ -81,9 +81,8 @@ EOF
 fi
 
 if [ "$1" = "end" ]; then
-  # This is necessary because upgrading roundcube from 7.1 to 7.2 changes this setting
-  chown alternc-roundcube:root /etc/roundcube/config.inc.php
-  # In case owner is reset to www-data
-  chown alternc-roundcube:nogroup /var/lib/roundcube/temp
+  # Roundcube vhosts run as www-data instead of alternc-roundcube now.
+  # Ensure the configuration is owned by the appropriate user.
+  chown www-data:root /etc/roundcube/config.inc.php
+  chown www-data:nogroup /var/lib/roundcube/temp
 fi
-