launchpad-reviewers team mailing list archive

[Scott Moser <smoser@xxxxxxxxxx>]

Scott Moser has proposed merging lp:~smoser/maas/packaging.lp1049177 into lp:~maas-maintainers/maas/packaging.

Requested reviews:
  MAAS Maintainers (maas-maintainers)
Related bugs:
  Bug #1049177 in isc-dhcp (Ubuntu): "isc-dhcp-server apparmor profile should have include ".d" "
  https://bugs.launchpad.net/ubuntu/+source/isc-dhcp/+bug/1049177

For more details, see:
https://code.launchpad.net/~smoser/maas/packaging.lp1049177/+merge/124083
-- 
https://code.launchpad.net/~smoser/maas/packaging.lp1049177/+merge/124083
Your team MAAS Maintainers is requested to review the proposed merge of lp:~smoser/maas/packaging.lp1049177 into lp:~maas-maintainers/maas/packaging.

=== 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 <andreserl@xxxxxxxxxx>  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 <smoser@xxxxxxxxxx>  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: