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

diff --git a/xenial/debian/openstack-dashboard-apache.prerm b/xenial/debian/openstack-dashboard-apache.prerm
index d0149a6d8512e1fe8cc0a7977aa3890d6ea15334..4a00b346b9e1f9c9937d07f26d1a0f7255b4bb4e 100644 (file)
--- a/xenial/debian/openstack-dashboard-apache.prerm
+++ b/xenial/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#