From 78e59eff9e9f991258ab4a919fa73e6d64a8d9e7 Mon Sep 17 00:00:00 2001
From: Ghe Rivero <ghe@debian.org>
Date: Thu, 1 Mar 2012 17:58:56 +0100
Subject: [PATCH] moved apache config to virtualhost:8080

Rewritten-From: 9c8ff5d721d297b91892ffe7c7ea093dd105bf79
---
 ...shboard.apache.conf => openstack-dashboard-apache.conf} | 7 ++++++-
 trusty/debian/openstack-dashboard-apache.install           | 2 +-
 trusty/debian/openstack-dashboard-apache.postinst          | 3 ++-
 trusty/debian/openstack-dashboard-apache.prerm             | 7 +++++++
 trusty/debian/rules                                        | 4 ++--
 5 files changed, 18 insertions(+), 5 deletions(-)
 rename trusty/debian/{dashboard.apache.conf => openstack-dashboard-apache.conf} (71%)
 create mode 100644 trusty/debian/openstack-dashboard-apache.prerm

diff --git a/trusty/debian/dashboard.apache.conf b/trusty/debian/openstack-dashboard-apache.conf
similarity index 71%
rename from trusty/debian/dashboard.apache.conf
rename to trusty/debian/openstack-dashboard-apache.conf
index 8c5d2c4..a3a6294 100644
--- a/trusty/debian/dashboard.apache.conf
+++ b/trusty/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/trusty/debian/openstack-dashboard-apache.install b/trusty/debian/openstack-dashboard-apache.install
index 338e535..7307777 100644
--- a/trusty/debian/openstack-dashboard-apache.install
+++ b/trusty/debian/openstack-dashboard-apache.install
@@ -1 +1 @@
-etc/apache2/conf.d
+etc/apache2/sites-available
diff --git a/trusty/debian/openstack-dashboard-apache.postinst b/trusty/debian/openstack-dashboard-apache.postinst
index 067d38a..8633b45 100644
--- a/trusty/debian/openstack-dashboard-apache.postinst
+++ b/trusty/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/trusty/debian/openstack-dashboard-apache.prerm b/trusty/debian/openstack-dashboard-apache.prerm
new file mode 100644
index 0000000..f731910
--- /dev/null
+++ b/trusty/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/trusty/debian/rules b/trusty/debian/rules
index a042c50..8230804 100755
--- a/trusty/debian/rules
+++ b/trusty/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
-- 
2.45.2