From: Ghe Rivero <ghe@debian.org>
Date: Thu, 1 Mar 2012 10:36:49 +0000 (+0100)
Subject: Updated apache conf to new directories
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d91d7d751c78253e5f96902e3a77ebd0ecf0d155;p=openstack-build%2Fhorizon-build.git
Updated apache conf to new directories
Rewritten-From: 42ed11e479e8516408c098bcb049cec70221a5d9
---
diff --git a/trusty/debian/dashboard.conf b/trusty/debian/dashboard.conf
index 207cc51..cdbf106 100644
--- a/trusty/debian/dashboard.conf
+++ b/trusty/debian/dashboard.conf
@@ -1,6 +1,6 @@
-WSGIScriptAlias / /usr/share/openstack-dashboard/dashboard/wsgi/django.wsgi
+WSGIScriptAlias / /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
-<Directory /usr/share/openstack-dashboard/dashboard/wsgi>
+<Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi/>
Order allow,deny
Allow from all
</Directory>
diff --git a/trusty/debian/patches/pkg_data.patch b/trusty/debian/patches/pkg_data.patch
new file mode 100644
index 0000000..70ca545
--- /dev/null
+++ b/trusty/debian/patches/pkg_data.patch
@@ -0,0 +1,10 @@
+--- a/setup.py
++++ b/setup.py
+@@ -41,6 +41,7 @@
+ + findall('horizon/dashboards/nova/templates') \
+ + findall('horizon/dashboards/syspanel/templates') \
+ + findall('horizon/dashboards/settings/templates')]},
++ include_package_data=True,
+ install_requires=[],
+ classifiers=['Development Status :: 4 - Beta',
+ 'Framework :: Django',
diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
new file mode 100644
index 0000000..b89fd3f
--- /dev/null
+++ b/trusty/debian/patches/series
@@ -0,0 +1 @@
+pkg_data.patch