Initial apache2 support

Rewritten-From: c74412c5cd0b4b4e0dc9dc5db93f3b6232b2b06d

diff --git a/xenial/debian/control b/xenial/debian/control
index 221fc1fdddeec4b481ff2e35ab7d6fe4da4c45c1..a8feee588e006d3d1ae3058250554a90d165d6b5 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -6,21 +6,37 @@ Uploaders: Julien Danjou <acid@debian.org>,
            Thomas Goirand <zigo@debian.org>,
            Ghe Rivero <ghe@debian.org>
 Build-Depends: debhelper (>= 8.0.0), python, python-setuptools
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://launchpad.net/horizon
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/horizon.git;a=summary
 Vcs-Git: git://anonscm.debian.org/openstack/horizon.git
 
 Package: python-django-horizon
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-quantumclient, python-glance, python-mox, python-dateutil
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${python:Depends},
+ python-quantumclient,
+ python-glance,
+ python-mox,
+ python-dateutil
 Description: Django module to provide web interaction with OpenStack
  Horizon is a Django module that permits interaction with an OpenStack
  cloud. It can be used to build a dashboard to control an OpenStack cloud.
 
 Package: openstack-dashboard
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-django-horizon, python-django, python-openstackx, python-django-nose, python-keystoneclient, python-cloudfiles, libjs-jquery
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ ${python:Depends},
+ python-django-horizon,
+ python-django,
+ python-openstackx,
+ python-django-nose,
+ python-keystoneclient,
+ python-cloudfiles,
+ libjs-jquery
+Recommends: libapache2-mod-wsgi (>= 2.3)
 Description: OpenStack Dashboard
  The OpenStack Dashboard is a Web application allowing to control an
  OpenStack cloud.
\ No newline at end of file

diff --git a/xenial/debian/dashboard.conf b/xenial/debian/dashboard.conf
new file mode 100644 (file)
index 0000000..207cc51
--- /dev/null
+++ b/xenial/debian/dashboard.conf
@@ -0,0 +1,6 @@
+WSGIScriptAlias / /usr/share/openstack-dashboard/dashboard/wsgi/django.wsgi
+
+<Directory /usr/share/openstack-dashboard/dashboard/wsgi>
+  Order allow,deny
+  Allow from all
+</Directory>

diff --git a/xenial/debian/openstack-dashboard.install b/xenial/debian/openstack-dashboard.install
index d845602f29c27532c69a1affff947d7c806ada9e..f042edb712ad62ad8f22a47deb9abaf803f817e7 100644 (file)
--- a/xenial/debian/openstack-dashboard.install
+++ b/xenial/debian/openstack-dashboard.install
@@ -1,2 +1,3 @@
 usr/share/openstack-dashboard
-etc/openstack-dashboard
\ No newline at end of file
+etc/openstack-dashboard
+etc/apache2/conf.d

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 5dce6dfdd048caf29659e50ef85861c08054d2b9..f8594b0bbfbf07345511dc9dd0bf45c086d0e151 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -1,4 +1,8 @@
 #!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
 %:
        dh $@ --with python2
 
@@ -8,9 +12,14 @@ override_dh_auto_install:
        install -d -m 755 $(CURDIR)/debian/tmp/etc/openstack-dashboard
 
        cp -a $(CURDIR)/openstack_dashboard/ $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
-       cp $(CURDIR)/openstack_dashboard/local/local_settings.py.example $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
-       cp $(CURDIR)/manage.py $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
-       ln -fs /etc/openstack-dashboard/local_settings.py $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py
+       cp -a $(CURDIR)/debian/dashboard.conf $(CURDIR)/debian/tmp/etc/apache2/conf.d
+
+       cp $(CURDIR)/openstack_dashboard/local/local_settings.py.example \
+               $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
+       cp $(CURDIR)/manage.py \
+               $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
+       ln -fs /etc/openstack-dashboard/local_settings.py \
+               $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py
 
 override_dh_auto_clean:
        dh_auto_clean