moved apache config to virtualhost:8080

Rewritten-From: 9c8ff5d721d297b91892ffe7c7ea093dd105bf79

diff --git a/xenial/debian/dashboard.apache.conf b/xenial/debian/openstack-dashboard-apache.conf
similarity index 71%
rename from xenial/debian/dashboard.apache.conf
rename to xenial/debian/openstack-dashboard-apache.conf
index 8c5d2c42b59a284e9512508425d9629cf116e332..a3a62942523a7df3d9dd07139d7f279f250148a1 100644 (file)
--- a/xenial/debian/dashboard.apache.conf
+++ b/xenial/debian/openstack-dashboard-apache.conf
@@ -1,6 +1,11 @@
-<VirtualHost *:80>
+Listen 8080
+<VirtualHost *:8080>
     WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
 
+    <Directory />
+        AllowOverride None
+    </Directory>
+
     <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi/>
         Order allow,deny
         Allow from all

diff --git a/xenial/debian/openstack-dashboard-apache.install b/xenial/debian/openstack-dashboard-apache.install
index 338e535c6136fb4a21218721fd2283ddcf8bc35f..7307777bc7c6c846b456c8127df8c2747d2b33e2 100644 (file)
--- a/xenial/debian/openstack-dashboard-apache.install
+++ b/xenial/debian/openstack-dashboard-apache.install
@@ -1 +1 @@
-etc/apache2/conf.d
+etc/apache2/sites-available

diff --git a/xenial/debian/openstack-dashboard-apache.postinst b/xenial/debian/openstack-dashboard-apache.postinst
index 067d38a231b6381ab2d84199fee24289518ed35f..8633b45d80757e6a2bfb017e6aa1d0fe463087e8 100644 (file)
--- a/xenial/debian/openstack-dashboard-apache.postinst
+++ b/xenial/debian/openstack-dashboard-apache.postinst
@@ -4,7 +4,8 @@ set -e
 
 if [ "$1" = "configure" ]; then
         if [ -x /etc/init.d/apache2 ]; then
-                invoke-rc.d --quiet apache2 reload
+           a2ensite openstack-dashboard
+           invoke-rc.d --quiet apache2 reload
         fi
 fi
 

diff --git a/xenial/debian/openstack-dashboard-apache.prerm b/xenial/debian/openstack-dashboard-apache.prerm
new file mode 100644 (file)
index 0000000..f731910
--- /dev/null
+++ b/xenial/debian/openstack-dashboard-apache.prerm
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+a2dissite openstack-dashboard
+
+#DEBHELPER#
\ No newline at end of file

diff --git a/xenial/debian/rules b/xenial/debian/rules
index a042c504e0f2d48a30eec3614d6c228497090216..823080499585e8f1c88fd088eb7084600840b8eb 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -22,8 +22,8 @@ override_dh_auto_install:
                $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py
 
        # openstack-dashboard-apache
-       install -d -m 755 $(CURDIR)/debian/tmp/etc/apache2/conf.d
-       cp -a $(CURDIR)/debian/dashboard.apache.conf $(CURDIR)/debian/tmp/etc/apache2/conf.d/dashboard.conf
+       install -d -m 755 $(CURDIR)/debian/tmp/etc/apache2/sites-available/
+       cp -a $(CURDIR)/debian/openstack-dashboard-apache.conf $(CURDIR)/debian/tmp/etc/apache2/sites-available/openstack-dashboard
 
 override_dh_auto_clean:
        dh_auto_clean