From e2237a2ed931d0c235e10e7599ffa6a39c55af58 Mon Sep 17 00:00:00 2001
From: Benjamin Sonntag <benjamin@sonntag.fr>
Date: Sun, 24 Jun 2018 16:50:08 +0200
Subject: [PATCH] [fix] roundcube to core javascript disable conf apache2

---
 install/alternc.install     |  5 +++++
 roundcube/roundcube-install | 18 +-----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/install/alternc.install b/install/alternc.install
index 5fef1d39..9c9857db 100644
--- a/install/alternc.install
+++ b/install/alternc.install
@@ -431,6 +431,11 @@ if [ -L /etc/apache2/conf-enabled/phpmyadmin.conf ]
 then
     a2disconf phpmyadmin
 fi
+# Remove global /javascript alias (side effect warning)
+if [ -L /etc/apache2/conf-enabled/javascript-common.conf ]
+then
+    a2disconf javascript-common
+fi
 
 # Configure PHPMyAdmin
 include_str='include("/etc/alternc/phpmyadmin.inc.php")'
diff --git a/roundcube/roundcube-install b/roundcube/roundcube-install
index d1ceb3ff..4e9149b3 100644
--- a/roundcube/roundcube-install
+++ b/roundcube/roundcube-install
@@ -25,13 +25,11 @@
 if [ "$1" = "templates" ]
 then
     echo "Installing Roundcube Templates ..."
-#    cp -f /etc/alternc/templates/roundcube/avelsieve-config.php /etc/alternc/templates/roundcube/apache.conf /etc/roundcube/
-#    cp -f /etc/alternc/templates/javascript-common/javascript-common.conf /etc/javascript-common/
 
     LOGIN="0000_roundcube"
     PASSWORD="`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..10)'`"
     DESKEY="`perl -e 'print map{("a".."z","A".."Z",0..9)[int(rand(62))]}(1..24)'`"
-
+    # "
     # Add new variables to the sed script ...
     SED_SCRIPT="/tmp/alternc-roundcube.sedscript"
     # cf alternc.install for more explanations on this horror : 
@@ -80,20 +78,6 @@ EOF
     mysql_query "UPDATE sub_domaines SET web_action='DELETE' WHERE type='WEBMAIL';"
     echo "    Done"
 
-    echo "Deconfiguring javascript-common alias"
-    if [ -f /etc/apache2/conf.d/javascript-common.conf ]; then
-        	rm -f /etc/apache2/conf.d/javascript-common.conf
-    fi
-    if [ -f /etc/apache2/conf-available/javascript-common.conf ] ; then
-		a2disconf javascript-common.conf
-		service apache2 reload
-    fi
-    # just in case 
-    if [ -f /etc/javascript-common/javascript-common.conf ]; then
-        sed -i -e "s/^Alias \/javascript/# Do not uncomment, commented by AlternC to prevent a global alias\n#Alias \/javascript/" /etc/javascript-common/javascript-common.conf
-    fi
-    echo "    Done"
-    
 fi
 
 if [ "$1" = "end" ]; then