Bug 12495 - Include streetnumber in hold alert address

[koha_fer] / debian / koha-common.postinst

diff --git a/debian/koha-common.postinst b/debian/koha-common.postinst
index 1912659..86c9404 100644 (file)
--- a/debian/koha-common.postinst
+++ b/debian/koha-common.postinst
@@ -109,16 +109,20 @@ EOF
             ENABLE_VHOST="yes"
             if [ -f "/etc/apache2/sites-available/$site" ] && \
                [ ! -f "/etc/apache2/sites-available/$site.conf" ]; then
-                if ! a2dissite $site > /dev/null 2>&1; then
-                    echo "Warning: problem disabling $site in Apache" >&2
+                if [ ! -f "/etc/apache2/sites-enabled/$site" ]; then
                     ENABLE_VHOST="no"
                 fi
+                a2dissite $site > /dev/null 2>&1 || true
+                rm -f "/etc/apache2/sites-enabled/$site"
                 # Rename the vhost definition files
                 mv "/etc/apache2/sites-available/$site" \
                    "/etc/apache2/sites-available/$site.conf"
 
                 if [ "$ENABLE_VHOST" = "yes" ]; then
-                    if ! a2ensite $site > /dev/null 2>&1; then
+                    if ! {
+                        a2ensite "$site" > /dev/null 2>&1 ||
+                        a2ensite "${site}.conf" > /dev/null 2>&1
+                    }; then
                         echo "Warning: problem enabling $site in Apache" >&2
                     fi
                 fi