Simplify shipping of the Apache config file

Rewritten-From: 09fba755f895130e7e9a2484b61f6706775b0b13

diff --git a/xenial/debian/openstack-dashboard-apache.conf b/xenial/debian/openstack-dashboard-apache.conf
deleted file mode 100644 (file)
index fcb7a9d..0000000
--- a/xenial/debian/openstack-dashboard-apache.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-<VirtualHost *:8080>
-    WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
-    WSGIDaemonProcess openstack-dashboard user=horizon group=horizon
-    WSGIProcessGroup openstack-dashboard
-
-    <Directory />
-        AllowOverride None
-    </Directory>
-
-    <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi/>
-        Order allow,deny
-        Allow from all
-    </Directory>
-
-    Alias /static/horizon /usr/share/pyshared/horizon/static/horizon
-
-    <Directory /usr/share/pyshared/horizon/static/horizon>
-        Order allow,deny
-        Allow from all
-    </Directory>
-
-    Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static
-
-    <Directory /usr/share/openstack-dashboard/openstack_dashboard/static/>
-       Order allow,deny
-       Allow from all
-    </Directory>
-
-</VirtualHost>

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

diff --git a/xenial/debian/patches/apache-config-file.patch b/xenial/debian/patches/apache-config-file.patch
new file mode 100644 (file)
index 0000000..92b3308
--- /dev/null
+++ b/xenial/debian/patches/apache-config-file.patch
@@ -0,0 +1,34 @@
+Index: horizon/etc/apache2/openstack-dashboard
+===================================================================
+--- /dev/null
++++ horizon/etc/apache2/openstack-dashboard
+@@ -0,0 +1,29 @@
++<VirtualHost *:8080>
++    WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
++    WSGIDaemonProcess openstack-dashboard user=horizon group=horizon
++    WSGIProcessGroup openstack-dashboard
++
++    <Directory />
++        AllowOverride None
++    </Directory>
++
++    <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi/>
++        Order allow,deny
++        Allow from all
++    </Directory>
++
++    Alias /static/horizon /usr/share/pyshared/horizon/static/horizon
++
++    <Directory /usr/share/pyshared/horizon/static/horizon>
++        Order allow,deny
++        Allow from all
++    </Directory>
++
++    Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static
++
++    <Directory /usr/share/openstack-dashboard/openstack_dashboard/static/>
++      Order allow,deny
++      Allow from all
++    </Directory>
++
++</VirtualHost>

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 64c0a5e0eacebb22ec185c86a926f52196dec9ab..47eb7dee477119b16399605a4bb1d9b3876668df 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -2,3 +2,4 @@ fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fix-ubuntu-tests.patch
 debian_local_settings.patch
+apache-config-file.patch

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 12a6305155d609ef68b2ab6cc14ee71628682ad6..fed090fe2ce1078013def4ff9caa49ada399b1bb 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -34,10 +34,8 @@ override_dh_auto_install:
        chmod 644 $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js/*.js
        chmod 644 $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css/*.css
        chmod 644 $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/manifest.json
-       
-       # openstack-dashboard-apache
-       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
+
+       dh_auto_install
 
 override_dh_builddeb:
        dh_builddeb -- -Zxz -z9