OpenStack Dashboard (Horizon)

Merge lp:~zulcss/horizon/apache-transition into lp:~ubuntu-server-dev/horizon/havana

  1. apache-transition
  2. Merge into havana
Proposed by Chuck Short
Status: Rejected
Rejected by: James Page
Proposed branch: lp:~zulcss/horizon/apache-transition
Merge into: lp:~ubuntu-server-dev/horizon/havana
Diff against target: 36 lines (+6/-2)
2 files modified
debian/changelog (+4/-0)
debian/rules (+2/-2)
To merge this branch: bzr merge lp:~zulcss/horizon/apache-transition
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+175641@code.launchpad.net

Description of the change

apache2.4 transition

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

On Thu, Jul 18, 2013 at 05:30:33PM -0000, Chuck Short wrote:
> - install -d -m 755 $(CURDIR)/debian/tmp/etc/apache2/conf.d
> + install -d -m 755 $(CURDIR)/debian/tmp/etc/apache2/conf-avaialable

Typo.

> - cp -a $(CURDIR)/debian/openstack-dashboard.conf $(CURDIR)/debian/tmp/etc/apache2/conf.d
> + cp -a $(CURDIR)/debian/openstack-dashboard.conf $(CURDIR)/debian/tmp/etc/apache2/conf-available

This should use dh_apache2; see
http://wiki.debian.org/Apache/PackagingFor24.

Doesn't this also require a .maintscript (or similar, see
dh_installdeb(1) and dpkg-maintscript-helper(1)) to move the old
conffile to the new location?

Unmerged revisions

157. By Chuck Short

debian/rules: Apache 2.4 transition

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-07-09 12:56:34 +0000
3+++ debian/changelog 2013-07-18 17:29:26 +0000
4@@ -1,7 +1,11 @@
5 horizon (1:2013.2~b1-0ubuntu2) UNRELEASED; urgency=low
6
7+ [ James Page ]
8 * d/control: Update VCS fields for new branch locations.
9
10+ [ Chuck Short ]
11+ * debian/rules: Apache 2.4 transition
12+
13 -- James Page <james.page@ubuntu.com> Tue, 09 Jul 2013 13:56:21 +0100
14
15 horizon (1:2013.2~b1-0ubuntu1) saucy; urgency=low
16
17=== modified file 'debian/rules'
18--- debian/rules 2012-09-12 04:48:41 +0000
19+++ debian/rules 2013-07-18 17:29:26 +0000
20@@ -12,14 +12,14 @@
21 install -d -m 755 $(CURDIR)/debian/tmp/usr/share/openstack-dashboard
22 install -d -m 755 $(CURDIR)/debian/tmp/etc/openstack-dashboard
23 install -d -m 755 $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/quantum
24- install -d -m 755 $(CURDIR)/debian/tmp/etc/apache2/conf.d
25+ install -d -m 755 $(CURDIR)/debian/tmp/etc/apache2/conf-avaialable
26
27 cp -a $(CURDIR)/openstack_dashboard/ $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
28 cp -a $(CURDIR)/openstack_dashboard/settings.py $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
29
30 touch $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/quantum/__init__.py
31 touch $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/quantum/client.py
32- cp -a $(CURDIR)/debian/openstack-dashboard.conf $(CURDIR)/debian/tmp/etc/apache2/conf.d
33+ cp -a $(CURDIR)/debian/openstack-dashboard.conf $(CURDIR)/debian/tmp/etc/apache2/conf-available
34 cp $(CURDIR)/openstack_dashboard/local/local_settings.py.example \
35 $(CURDIR)/debian/tmp/etc/openstack-dashboard/local_settings.py
36 cp $(CURDIR)/manage.py \

Subscribers

People subscribed via source and target branches