Merge lp:~smoser/maas/packaging.lp1049177 into lp:~maas-maintainers/maas/packaging

[Scott Moser]

Add a maas specific profile for isc-dhcp-server package.

[Scott Moser (smoser)]

In work done to the isc-dhcp package under bug 1049177 I modified the apparmor profile to have '#include <dhcpd.d>', allowing packages to install extensions to the base profile into package specific files in /etc/apparmor.d/dhcpd.d .

This packaging change adds a file there that should allow maas to run a dhcpd with a command line similar to:
  dhcpd -d -user dhcpd -group dhcpd -f -4 \
   -pf /run/maas/dhcp/dhcpd.pid -cf /etc/maas/dhcpd.conf \
   -lf /run/maas/dhcp/dhcpd.leases

I've tested that the given profile allows running of the above, but it is a bit tricky to get right. I've put a script that creates correct permissions at [1]. That is largely modelled after the upstart job in /etc/init/isc-dhcpd-server .

Note also that still to be done here is to install the upstart job. There is probably some packaging changes needed to get the upstart job into the maas-dhcp package. I believe that Jeroen's intent was to have trunk install /etc/init/maas-dhcp.conf but we'll need to pick that file into the maas-dhcp package still.

--
[1] http://paste.ubuntu.com/1201622/

[Julian Edwards (julian-edwards)]

We need a similar fix in the packaging.precise packaging branch too, otherwise this looks good.

review: Approve

[Jeroen T. Vermeulen (jtv)]

Is the leases file a typo? It should be in /var/lib of course, not in /run.

[Jeroen T. Vermeulen (jtv)]

Ah yes I see it is just a typo. No worries.

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-05 16:40:29 +0000
+++ debian/changelog	2012-09-13 00:23:19 +0000
@@ -1,8 +1,10 @@
-maas (0.1+bzr971+dfsg-0ubuntu3) UNRELEASED; urgency=low
-
-  * UNRELEASED
-
- -- Andres Rodriguez <[e-mail]>  Wed, 05 Sep 2012 12:40:20 -0400
+maas (0.1+bzr971+dfsg-0ubuntu4) UNRELEASED; urgency=low
+
+  [ Scott Moser ]
+  * debian/maas-dhcp.{install,apparmor} install apparmor profile into
+    /etc/apparmor.d/dhcpd.d (LP: #1049177)
+
+ -- Scott Moser <[e-mail]>  Wed, 12 Sep 2012 20:10:13 -0400
 
 maas (0.1+bzr971+dfsg-0ubuntu2) quantal; urgency=low
 

=== added file 'debian/maas-dhcp.apparmor'
--- debian/maas-dhcp.apparmor	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.apparmor	2012-09-13 00:23:19 +0000
@@ -0,0 +1,7 @@
+/run/maas/dhcp/ r,
+/run/maas/dhcp/** r,
+/run/maas/dhcp/*.pid lrw,
+/run/maas/dhcp/*.trace lrw,
+/run/maas/dhcp/*.leases* lrw,
+/var/lib/maas/dhcpd/*.leases* lrw,
+/etc/maas/dhcpd.conf r,

=== added file 'debian/maas-dhcp.install'
--- debian/maas-dhcp.install	1970-01-01 00:00:00 +0000
+++ debian/maas-dhcp.install	2012-09-13 00:23:19 +0000
@@ -0,0 +1,1 @@
+/debian/tmp/etc/apparmor.d/dhcpd.d/maas

=== modified file 'debian/rules'
--- debian/rules	2012-08-29 02:56:47 +0000
+++ debian/rules	2012-09-13 00:23:19 +0000
@@ -32,6 +32,11 @@
 	# Install built enums.js file.
 	cp $(BUILDHOME)/enums.js $(CURDIR)/debian/tmp/usr/share/maas/web/static/js/
 
+	# install the apparmor profile
+	install -d -m 755 $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d
+	install -m 644 $(CURDIR)/debian/maas-dhcp.apparmor \
+	    $(CURDIR)/debian/tmp/etc/apparmor.d/dhcpd.d/maas
+
 	dh_install --list-missing
 
 override_dh_auto_clean: