Merge lp:~andreserl/maas/fix_lp1439159 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Disable conflicting services, so that maas-proxy or maas-dhcp can run without any issues

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst	2014-08-22 13:03:09 +0000
+++ debian/maas-dhcp.postinst	2015-04-01 12:42:04 +0000
@@ -6,7 +6,12 @@
 then
     # Stop the dhcpd instance that came with the isc-dhcp-server package.
     # We run our own dhcpd instances.
-    invoke-rc.d isc-dhcp-server stop
+    if [ -d /run/systemd/system ]; then
+        systemctl stop isc-dhcp-server >/dev/null || true
+        systemctl disable isc-dhcp-server >/dev/null || true
+    else
+        invoke-rc.d isc-dhcp-server stop
+    fi
 
     dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
     if [ -f "${dhcpd_prof}" ] && command -v apparmor_parser >/dev/null 2>&1

=== modified file 'debian/maas-proxy.postinst'
--- debian/maas-proxy.postinst	2014-09-24 17:14:12 +0000
+++ debian/maas-proxy.postinst	2015-04-01 12:42:04 +0000
@@ -6,7 +6,12 @@
 then
     # Stop the squid3 instance that came with the isc-dhcp-server package.
     # We run our own squid3 instances.
-    invoke-rc.d squid3 stop
+    if [ -d /run/systemd/system ]; then
+        systemctl stop squid3 >/dev/null || true
+        systemctl disable squid3 >/dev/null || true
+    else
+        invoke-rc.d squid3 stop
+    fi
 
     # Ensure log folder is created.
     mkdir -p /var/log/maas/proxy