View | Details | Raw Unified | Return to bug 12312
Collapse All | Expand All

(-)a/debian/koha-common.postinst (-1 / +4 lines)
Lines 119-125 EOF Link Here
119
                   "/etc/apache2/sites-available/$site.conf"
119
                   "/etc/apache2/sites-available/$site.conf"
120
120
121
                if [ "$ENABLE_VHOST" = "yes" ]; then
121
                if [ "$ENABLE_VHOST" = "yes" ]; then
122
                    if ! a2ensite $site > /dev/null 2>&1; then
122
                    if ! {
123
                        a2ensite "$site" > /dev/null 2>&1 ||
124
                        a2ensite "${site}.conf" > /dev/null 2>&1
125
                    }; then
123
                        echo "Warning: problem enabling $site in Apache" >&2
126
                        echo "Warning: problem enabling $site in Apache" >&2
124
                    fi
127
                    fi
125
                fi
128
                fi
(-)a/debian/scripts/koha-create (-1 / +6 lines)
Lines 619-625 fi Link Here
619
if [ "$op" = create ] || [ "$op" = populate ] || [ "$op" = use ]
619
if [ "$op" = create ] || [ "$op" = populate ] || [ "$op" = use ]
620
then
620
then
621
    # Reconfigure Apache.
621
    # Reconfigure Apache.
622
    a2ensite "$name"
622
    if ! {
623
        a2ensite "$name" > /dev/null 2>&1 ||
624
            a2ensite "${name}.conf" > /dev/null 2>&1
625
    }; then
626
        echo "Warning: problem enabling $name in Apache" >&2
627
    fi
623
    service apache2 restart
628
    service apache2 restart
624
629
625
    # Start Zebra.
630
    # Start Zebra.
(-)a/debian/scripts/koha-remove (-2 / +1 lines)
Lines 104-110 eof Link Here
104
        rm -r "/var/run/koha/$name"
104
        rm -r "/var/run/koha/$name"
105
    getent passwd "$name-koha" > /dev/null && deluser --quiet "$name-koha"
105
    getent passwd "$name-koha" > /dev/null && deluser --quiet "$name-koha"
106
    # in case the site has already been disabled, we don't want to break the loop now.
106
    # in case the site has already been disabled, we don't want to break the loop now.
107
    a2dissite "$name" || /bin/true
107
    a2dissite "$name" > /dev/null 2>&1 || a2dissite "${name}.conf" > /dev/null 2>&1 || /bin/true
108
done
108
done
109
109
110
service apache2 restart
110
service apache2 restart
111
- 

Return to bug 12312