Attachment #28188 for bug #11404

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





db_input medium koha-common/automatically-update-translations || true

# Determine if we should ask the user about upgrading - there's no point
# if this is a fresh install anyway.
if [ -e /usr/sbin/koha-list ]; then
    RENAME_APACHE_FILES="no"
    for vhost in $(koha-list); do
        if [ -f "/etc/apache2/sites-available/$vhost" ] && \
           [ ! -f "/etc/apache2/sites-available/$vhost.conf" ]; then
           RENAME_APACHE_FILES="yes"
           break # at least one, trigger renaming
        fi
    done
    if [ "$RENAME_APACHE_FILES" = "yes" ]; then
        db_input high koha-common/rename-apache-vhost-files || true
    fi
fi

db_go || true





            ENABLE_VHOST="yes"
            if [ -f "/etc/apache2/sites-available/$site" ] && \
               [ ! -f "/etc/apache2/sites-available/$site.conf" ]; then
                if [ ! -f "/etc/apache2/sites-enabled/$site" ]; then
                    echo "Warning: problem disabling $site in Apache" >&2
                    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"
- 

Return to bug 11404

Lines 42-48 fi Link Here

(-)a/debian/koha-common.config (-1 / +15 lines)
42		42
43	db_input medium koha-common/automatically-update-translations \|\| true	43	db_input medium koha-common/automatically-update-translations \|\| true
44		44
45	db_input high koha-common/rename-apache-vhost-files \|\| true	45	# Determine if we should ask the user about upgrading - there's no point
		46	# if this is a fresh install anyway.
		47	if [ -e /usr/sbin/koha-list ]; then
		48	RENAME_APACHE_FILES="no"
		49	for vhost in $(koha-list); do
		50	if [ -f "/etc/apache2/sites-available/$vhost" ] && \
		51	[ ! -f "/etc/apache2/sites-available/$vhost.conf" ]; then
		52	RENAME_APACHE_FILES="yes"
		53	break # at least one, trigger renaming
		54	fi
		55	done
		56	if [ "$RENAME_APACHE_FILES" = "yes" ]; then
		57	db_input high koha-common/rename-apache-vhost-files \|\| true
		58	fi
		59	fi
46		60
47	db_go \|\| true	61	db_go \|\| true
48		62

Lines 109-118 EOF Link Here

(-)a/debian/koha-common.postinst (-3 / +3 lines)
109	ENABLE_VHOST="yes"	109	ENABLE_VHOST="yes"
110	if [ -f "/etc/apache2/sites-available/$site" ] && \	110	if [ -f "/etc/apache2/sites-available/$site" ] && \
111	[ ! -f "/etc/apache2/sites-available/$site.conf" ]; then	111	[ ! -f "/etc/apache2/sites-available/$site.conf" ]; then
112	if ! a2dissite $site > /dev/null 2>&1; then	112	if [ ! -f "/etc/apache2/sites-enabled/$site" ]; then
113	echo "Warning: problem disabling $site in Apache" >&2
114	ENABLE_VHOST="no"	113	ENABLE_VHOST="no"
115	fi	114	fi
		115	a2dissite $site > /dev/null 2>&1 \|\| true
		116	rm -f "/etc/apache2/sites-enabled/$site"
116	# Rename the vhost definition files	117	# Rename the vhost definition files
117	mv "/etc/apache2/sites-available/$site" \	118	mv "/etc/apache2/sites-available/$site" \
118	"/etc/apache2/sites-available/$site.conf"	119	"/etc/apache2/sites-available/$site.conf"
119	-