Fix bug 820845

Rewritten-From: 117e9f3869a608852acc50b0d9e9734784c0abaf

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index b394a269f4f44dfe4d87e0461c4198517358fc74..64e6b7c5544847ec8e5d01fe5b47f0eaacd38139 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,8 +1,14 @@
 horizon (2:9.0.0-2) UNRELEASED; urgency=medium
 
+  [ Ondřej Nový ]
   * Standards-Version is 3.9.8 now (no change)
 
- -- Ondřej Nový <novy@ondrej.org>  Sat, 09 Apr 2016 19:22:59 +0200
+  [ Ivan Udovichenko ]
+  * d/openstack-dashboard-apache.postinst: Revert changes. (Closes: #820845)
+    - Do not modify provided Apache configuration files.
+    - Enable site provided by openstack-dashboard-alias-only.conf .
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Wed, 13 Apr 2016 23:34:27 +0300
 
 horizon (2:9.0.0-1) unstable; urgency=medium
 

diff --git a/trusty/debian/openstack-dashboard-apache.postinst b/trusty/debian/openstack-dashboard-apache.postinst
index 2e9e384573c67037889f3f3336485b1a4e545779..e78f07428719e058f3515524ebe4af2cccf4c225 100644 (file)
--- a/trusty/debian/openstack-dashboard-apache.postinst
+++ b/trusty/debian/openstack-dashboard-apache.postinst
@@ -61,23 +61,13 @@ HORIZON_USE_SSL=yes" >/etc/default/openstack-dashboard-apache
                invoke-rc.d --quiet apache2 reload
        else
                sed -i 's#[ \t]*HORIZON_ACTIVATE_VHOSTS=.*#HORIZON_ACTIVATE_VHOSTS=no#' /etc/default/openstack-dashboard-apache
-               site_configs='openstack-dashboard-ssl-redirect.conf
-                       openstack-dashboard-ssl.conf
-                       openstack-dashboard.conf
-                       openstack-dashboard-alias-only.conf'
-               for site_config in $site_configs
-               do
-                       if [ -f /etc/apache2/sites-available/$site_config ]; then
-                               sed -i 's#WSGIScriptAlias / #WSGIScriptAlias /horizon #g' /etc/apache2/sites-available/$site_config
-                       fi
-               done
                a2ensite 000-default.conf || true
                a2ensite default-ssl.conf || true
                sed -i "s|^[ \t]*WEBROOT[ \t]=.*|WEBROOT = '/horizon'|" /etc/openstack-dashboard/local_settings.py
                a2dissite openstack-dashboard.conf
                a2dissite openstack-dashboard-ssl-redirect.conf
                a2dissite openstack-dashboard-ssl.conf
-               a2dissite openstack-dashboard-alias-only.conf
+               a2ensite openstack-dashboard-alias-only.conf
                /usr/share/openstack-dashboard/manage.py collectstatic --clear --noinput
                /usr/share/openstack-dashboard/manage.py compress --force
                if [ -f /var/lib/openstack-dashboard/secret-key/.secret_key_store ]; then