From b636199382ffce1fb5fea372e1e1080da363fbca Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 19 Jul 2013 01:11:47 +0800 Subject: [PATCH] Fixes prerm so that it uninstalls the correct .conf files for apache, since old apache vhost has been rename because of apache 2.4. Also remove the old ones as a transition, but using || true to avoid failure (Closes: #669836). Change-Id: I586290a42eed25ec097e09ab52396fbde892064b (cherry picked from commit aacbc8c17353119a5c7bd72dd0c662100182e24d) Conflicts: debian/changelog Rewritten-From: c258b111704b4d7913d58430ef1a2d93d1b8d854 --- trusty/debian/openstack-dashboard-apache.prerm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/trusty/debian/openstack-dashboard-apache.prerm b/trusty/debian/openstack-dashboard-apache.prerm index d0149a6..4a00b34 100644 --- a/trusty/debian/openstack-dashboard-apache.prerm +++ b/trusty/debian/openstack-dashboard-apache.prerm @@ -3,9 +3,14 @@ set -e if [ -x /usr/sbin/a2dissite ] ; then - a2dissite openstack-dashboard - a2dissite openstack-dashboard-ssl-redirect - a2dissite openstack-dashboard-ssl + for i in openstack-dashboard openstack-dashboard-ssl-redirect openstack-dashboard-ssl ; do + if [ -L /etc/apache2/sites-available/${i} ] ; then + a2dissite ${i} || true + fi + if [ -L /etc/apache2/sites-available/${i}.conf ] ; then + a2dissite ${i}.conf + fi + done fi #DEBHELPER# -- 2.45.2