Initial apache2 support

Rewritten-From: 9197834f2dd05590b747ec12b1f6c9d036d956bb

diff --git a/xenial/debian/control b/xenial/debian/control
index 4a9b0c1ddc56c212853dadd32d8d9226ac6505ba..1d38f0dd975e00750693f49d3414d596e1c229aa 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -38,4 +38,12 @@ Depends: ${shlibs:Depends},
  libjs-jquery
 Description: OpenStack Dashboard
  The OpenStack Dashboard is a Web application allowing to control an
- OpenStack cloud.
\ No newline at end of file
+ OpenStack cloud.
+
+Package: openstack-dashboard-apache
+Architecture: all
+Depends: libapache2-mod-wsgi (>=2.3)
+Description: OpenStack Dashboard - Apache support
+ The OpenStack Dashboard is a Web application allowing to control an
+ OpenStack cloud.
+ This package includes the configuration files to use within apache.
\ No newline at end of file

diff --git a/xenial/debian/openstack-dashboard.install b/xenial/debian/openstack-dashboard.install
index f042edb712ad62ad8f22a47deb9abaf803f817e7..00fbcacef36fb144b15985c2d9ae95408ed8c570 100644 (file)
--- a/xenial/debian/openstack-dashboard.install
+++ b/xenial/debian/openstack-dashboard.install
@@ -1,3 +1,3 @@
 usr/share/openstack-dashboard
 etc/openstack-dashboard
-etc/apache2/conf.d
+

diff --git a/xenial/debian/rules b/xenial/debian/rules
index a36517dff6a19ab014dec46dda34d86ad8bac7d4..a042c504e0f2d48a30eec3614d6c228497090216 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -10,10 +10,9 @@ override_dh_auto_install:
        python setup.py install --root=$(CURDIR)/debian/tmp --no-compile -O0 --install-layout=deb
        install -d -m 755  $(CURDIR)/debian/tmp/usr/share/openstack-dashboard
        install -d -m 755 $(CURDIR)/debian/tmp/etc/openstack-dashboard
-       install -d -m 755 $(CURDIR)/debian/tmp/etc/apache2/conf.d
+
 
        cp -a $(CURDIR)/openstack_dashboard/ $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
-       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
@@ -22,6 +21,10 @@ override_dh_auto_install:
        ln -fs /etc/openstack-dashboard/local_settings.py \
                $(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
+
 override_dh_auto_clean:
        dh_auto_clean
        rm -rf $(CURDIR)/horizon/build