From 098dbd8cc3deb0e647f27df88d78b3a9896abe5b Mon Sep 17 00:00:00 2001
From: Roland Mas <lolando@debian.org>
Date: Tue, 30 Oct 2012 15:48:50 +0100
Subject: [PATCH] Simplify shipping of the Apache config file

Rewritten-From: 09fba755f895130e7e9a2484b61f6706775b0b13
---
 trusty/debian/openstack-dashboard-apache.conf | 29 ----------------
 .../debian/openstack-dashboard-apache.install |  2 +-
 .../debian/patches/apache-config-file.patch   | 34 +++++++++++++++++++
 trusty/debian/patches/series                  |  1 +
 trusty/debian/rules                           |  6 ++--
 5 files changed, 38 insertions(+), 34 deletions(-)
 delete mode 100644 trusty/debian/openstack-dashboard-apache.conf
 create mode 100644 trusty/debian/patches/apache-config-file.patch

diff --git a/trusty/debian/openstack-dashboard-apache.conf b/trusty/debian/openstack-dashboard-apache.conf
deleted file mode 100644
index fcb7a9d..0000000
--- a/trusty/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/trusty/debian/openstack-dashboard-apache.install b/trusty/debian/openstack-dashboard-apache.install
index 7307777..8ba5ad2 100644
--- a/trusty/debian/openstack-dashboard-apache.install
+++ b/trusty/debian/openstack-dashboard-apache.install
@@ -1 +1 @@
-etc/apache2/sites-available
+etc/apache2/openstack-dashboard /etc/apache2/sites-available
diff --git a/trusty/debian/patches/apache-config-file.patch b/trusty/debian/patches/apache-config-file.patch
new file mode 100644
index 0000000..92b3308
--- /dev/null
+++ b/trusty/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/trusty/debian/patches/series b/trusty/debian/patches/series
index 64c0a5e..47eb7de 100644
--- a/trusty/debian/patches/series
+++ b/trusty/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/trusty/debian/rules b/trusty/debian/rules
index 12a6305..fed090f 100755
--- a/trusty/debian/rules
+++ b/trusty/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
-- 
2.45.2