From: Gonéri Le Bouder Date: Wed, 5 Mar 2014 20:13:02 +0000 (+0100) Subject: avoid postinst failure X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b4000f988e03815498bb1270c69e6580b78fdff7;p=openstack-build%2Fhorizon-build.git avoid postinst failure if the default vhost was removed, a2dissite was not able to disable it as expected. Instead it produces a non 0 return code (cherry picked from commit 6a146da2aafc8acea43d658beda9f1824a09bd09) Rewritten-From: 68a365938dfab885033701481b60501722f8db98 --- diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 10ed204..b56d320 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -8,13 +8,15 @@ horizon (2014.1~b2-1) experimental; urgency=low CSS and the JS * Add call "manage.py compress" with the --force parameter to avoid a warning an harmless warning for the user. + * avoid openstack-dashboard-apache.postinst failure if the default vhost + has been removed. [ Thomas Goirand ] * New upstream release (Icehouse beta 1). * Removes CVE-2013-6858 patch applied upstream. * Refreshed patch. - -- Thomas Goirand Mon, 09 Dec 2013 22:14:27 +0800 + -- Gonéri Le Bouder Wed, 05 Mar 2014 20:55:14 +0100 horizon (2013.2-2) unstable; urgency=high diff --git a/trusty/debian/openstack-dashboard-apache.postinst b/trusty/debian/openstack-dashboard-apache.postinst index 70d75cb..5ea4272 100644 --- a/trusty/debian/openstack-dashboard-apache.postinst +++ b/trusty/debian/openstack-dashboard-apache.postinst @@ -23,7 +23,7 @@ HORIZON_USE_SSL=yes" >/etc/default/openstack-dashboard-apache db_get horizon/activate_vhost if [ "${RET}" = "true" ] && [ -x /etc/init.d/apache2 ] ; then sed -i 's#[ \t]*HORIZON_ACTIVATE_VHOSTS=.*#HORIZON_ACTIVATE_VHOSTS=yes#' /etc/default/openstack-dashboard-apache - a2dissite default + a2dissite default || true db_get horizon/use_ssl if [ "${RET}" = "true" ] ; then sed -i 's#[ \t]*HORIZON_USE_SSL=.*#HORIZON_USE_SSL=yes#' /etc/default/openstack-dashboard-apache