From 355214362c354dc127cda92834ac2d0d62346959 Mon Sep 17 00:00:00 2001 From: Ghe Rivero Date: Thu, 1 Mar 2012 13:13:26 +0100 Subject: [PATCH] Initial apache2 support Rewritten-From: 9197834f2dd05590b747ec12b1f6c9d036d956bb --- trusty/debian/control | 10 +++++++++- trusty/debian/openstack-dashboard.install | 2 +- trusty/debian/rules | 7 +++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/trusty/debian/control b/trusty/debian/control index 4a9b0c1..1d38f0d 100644 --- a/trusty/debian/control +++ b/trusty/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/trusty/debian/openstack-dashboard.install b/trusty/debian/openstack-dashboard.install index f042edb..00fbcac 100644 --- a/trusty/debian/openstack-dashboard.install +++ b/trusty/debian/openstack-dashboard.install @@ -1,3 +1,3 @@ usr/share/openstack-dashboard etc/openstack-dashboard -etc/apache2/conf.d + diff --git a/trusty/debian/rules b/trusty/debian/rules index a36517d..a042c50 100755 --- a/trusty/debian/rules +++ b/trusty/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 -- 2.45.2