Changeset 1472

Timestamp:

May 11, 2016, 10:31:40 AM (4 years ago)

Author:

mabarracus

Message:

Improved detection to avoid configure multi-sites twice

Location:

php5-lliurex-compat/fuentes/debian

Files:

• changelog (modified) (1 diff)
• postinst (modified) (3 diffs)

php5-lliurex-compat/fuentes/debian/changelog

@@ +1 @@
+php5-lliurex-compat (0.5-1) xenial; urgency=medium
+
+  * Improved detection to avoid configure multi-sites twice
+
+ -- M.Angel Juan <m.angel.juan@gmail.com>  Wed, 11 May 2016 10:30:28 +0200
+
 php5-lliurex-compat (0.5) xenial; urgency=medium
 

php5-lliurex-compat/fuentes/debian/postinst

@@ -38 +38 @@
     sed -i -r 's/443/4430/g' /etc/apache2-lliurex/ports.conf
     for site in /etc/apache2-lliurex/sites-available/*.conf; do
-        sed -i -r 's/\*:80/\*:800/g' ${site}
-        sed -i -r 's/\*:443/\*:4430/g' ${site}
+        tst80=$(egrep ':80' ${site}|wc -l)
+        tst443=$(egrep ':443' ${site}|wc -l)
+        if [ ${tst80} -ne 0 ]; then
+            echo "Fixing port 80 in site: " ${site}
+            sed -i -r 's/\*:80/\*:800/g' ${site}
+        fi
+        if [ ${tst443} -ne 0 ]; then
+            echo "Fixing port 443 in site: " ${site}
+            sed -i -r 's/\*:443/\*:4430/g' ${site}
+        fi
     done;
 }
@@ -48 +56 @@
     echo "Using: ${DISMOD_LLIUREX} & ${DISMOD}"
     if [ -L /etc/apache2-lliurex/mods-enabled/php7.0.load ]; then
+        echo "Disabling php7 into apache2-lliurex instance"
         ${DISMOD_LLIUREX} php7.0 
     fi
     if [ -L /etc/apache2/mods-enabled/php5.load ]; then
+        echo "Disabling php5 into apache2 instance"
         ${DISMOD} php5 
     fi
@@ -69 +79 @@
 case "$1" in
     configure)
-        setup_apache
+        if [ -d /etc/apache2-lliurex ]; then 
+            echo "Apache2 multi-instance seems already configured, skipping multi-instance configuration"
+        else
+            setup_apache
+        fi
         change_ports
         fix_mods
+        echo "Enabling multi-site services"
         systemctl enable apache2-lliurex
         systemctl daemon-reload