Updated apache conf to new directories

Rewritten-From: 42ed11e479e8516408c098bcb049cec70221a5d9

diff --git a/trusty/debian/dashboard.conf b/trusty/debian/dashboard.conf
index 207cc518cc5bb1fab533aabbce3191ca50d6dab0..cdbf10619bd11b1c2764a36a86be175fb0a7635b 100644 (file)
--- 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 (file)
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 (file)
index 0000000..b89fd3f
--- /dev/null
+++ b/trusty/debian/patches/series
@@ -0,0 +1 @@
+pkg_data.patch