Merge ~andreserl/maas:better_packaging_clean_lint into maas:master

[Andres Rodriguez]

debian/*: Improve packaging towards being lintian clean.

There are various packaging errors. This branch improves it so there are significantly less, but it doesn't make it fully lintian clean.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b better_packaging_clean_lint lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 76e5773970fe8536bef609324e3877dbec198f06

review: Approve

[Blake Rouse (blake-rouse)]

review: Needs Information

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b better_packaging_clean_lint lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/3740/consoleText

diff --git a/debian/changelog b/debian/changelog
index 5e57b59..268e1fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ maas (2.5.0~alpha2-0ubuntu1) UNRELEASED; urgency=medium
   * Don't autostart maas-rackd on install to avoid initialization errors.
     - debian/rules: add --no-start for maas-rackd.
     - debian/maas-rack-controller.postinst: enable/start maas-rackd.
+  * Make package more lintian clean:
+    - debian/*.postinst: Remove of use of systemctl for deb-system-*
+    - debian/*.lintin-overrides: Add overrides for a few warnings.
+  * debian/rules: Do not override dh_installinit as we are using systemd.
 
  -- Andres Rodriguez <[e-mail]>  Mon, 20 Aug 2018 14:19:25 -0400
 
diff --git a/debian/control b/debian/control
index d6e42cc..4650721 100644
--- a/debian/control
+++ b/debian/control
@@ -279,7 +279,7 @@ Description: MAAS DHCP server
 
 Package: maas-dns
 Architecture: all
-Depends: maas-region-api (>= 2.4.0~beta1~)
+Depends: maas-region-api (>= 2.4.0~beta1~), ${misc:Depends}
 Description: dummy transitional package for MAAS DNS server
  This package can be safely removed, as the configuration this package
  performed is now integrated in 'maas-region-api'.
diff --git a/debian/maas-common.lintian-overrides b/debian/maas-common.lintian-overrides
index bb8d8f4..6852fdb 100644
--- a/debian/maas-common.lintian-overrides
+++ b/debian/maas-common.lintian-overrides
@@ -1,2 +1,4 @@
-maas-common: binary-without-manpage
-maas-common: maintainer-script-calls-systemctl
+maas-common: python-script-but-no-python-dep usr/lib/maas/maas-common
+maas-common: python-script-but-no-python-dep usr/lib/maas/maas-delete-file
+maas-common: python-script-but-no-python-dep usr/lib/maas/maas-write-file
+maas-common: maintainer-script-should-not-use-recursive-chown-or-chmod
diff --git a/debian/maas-common.postinst b/debian/maas-common.postinst
index b6d346f..b3cf420 100644
--- a/debian/maas-common.postinst
+++ b/debian/maas-common.postinst
@@ -11,7 +11,7 @@ configure_logging() {
     fi
     chown syslog:syslog /var/log/maas/maas.log
     # Make sure rsyslog reads our config
-    systemctl restart rsyslog >/dev/null 2>&1 || true
+    deb-systemd-invoke restart 'rsyslog.service' >/dev/null || true
 }
 
 configure_lib_dir() {
diff --git a/debian/maas-dhcp.lintian-overrides b/debian/maas-dhcp.lintian-overrides
deleted file mode 100644
index 5fc172a..0000000
--- a/debian/maas-dhcp.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-maas-dhcp: maintainer-script-calls-systemctl
diff --git a/debian/maas-dhcp.postinst b/debian/maas-dhcp.postinst
index 902287a..6e38492 100644
--- a/debian/maas-dhcp.postinst
+++ b/debian/maas-dhcp.postinst
@@ -6,10 +6,10 @@ if [ "$1" = "configure" ]
 then
     # Stop the dhcpd instance that came with the isc-dhcp-server package.
     # We run our own dhcpd instances.
-    systemctl stop isc-dhcp-server >/dev/null 2>&1 || true
-    systemctl disable isc-dhcp-server >/dev/null 2>&1 || true
-    systemctl stop isc-dhcp-server6 >/dev/null 2>&1 || true
-    systemctl disable isc-dhcp-server6 >/dev/null 2>&1 || true
+    deb-systemd-invoke stop isc-dhcp-server >/dev/null || true
+    deb-systemd-helper disble isc-dhcp-server >/dev/null || true
+    deb-systemd-invoke stop isc-dhcp-server6 >/dev/null || true
+    deb-systemd-helper disble isc-dhcp-server6 >/dev/null || true
 
     dhcpd_prof="/etc/apparmor.d/usr.sbin.dhcpd"
     if [ -f "${dhcpd_prof}" ] && command -v apparmor_parser >/dev/null 2>&1
diff --git a/debian/maas-proxy.lintian-overrides b/debian/maas-proxy.lintian-overrides
index d05b23c..00fbdf5 100644
--- a/debian/maas-proxy.lintian-overrides
+++ b/debian/maas-proxy.lintian-overrides
@@ -1 +1 @@
-maas-proxy: maintainer-script-calls-systemctl
+maas-proxy: maintainer-script-should-not-use-recursive-chown-or-chmod
diff --git a/debian/maas-proxy.postinst b/debian/maas-proxy.postinst
index 74dd16a..9769fc2 100644
--- a/debian/maas-proxy.postinst
+++ b/debian/maas-proxy.postinst
@@ -8,8 +8,8 @@ then
     # We run our own squid3 instances.
     # Handle both versions of the name, for safety.
     for SQUID in squid squid3; do
-        systemctl stop ${SQUID} >/dev/null 2>&1 || true
-        systemctl disable ${SQUID} >/dev/null 2>&1 || true
+        deb-systemd-invoke stop ${SQUID} >/dev/null || true
+        deb-systemd-helper disable ${SQUID} >/dev/null || true
     done
 
     # Ensure log folder is created.
diff --git a/debian/maas-proxy.postrm b/debian/maas-proxy.postrm
index 9f5c346..cfe5093 100644
--- a/debian/maas-proxy.postrm
+++ b/debian/maas-proxy.postrm
@@ -12,7 +12,7 @@ fi
 # MAAS installation disables system squid so it doesn't
 # prevent MAAS from running our own squid daemon. As such,
 # on removal, reenable squid.
-systemctl enable squid >/dev/null 2>&1 || true
-systemctl start squid >/dev/null 2>&1 || true
+deb-systemd-helper enable squid >/dev/null || true
+deb-systemd-invoke start squid >/dev/null || true
 
 #DEBHELPER#
diff --git a/debian/maas-rack-controller.lintian-overrides b/debian/maas-rack-controller.lintian-overrides
index 50d0059..e720c16 100644
--- a/debian/maas-rack-controller.lintian-overrides
+++ b/debian/maas-rack-controller.lintian-overrides
@@ -1 +1,2 @@
 maas-rack-controller: binary-without-manpage
+maas-rack-controller: maintainer-script-should-not-use-recursive-chown-or-chmod
diff --git a/debian/maas-rack-controller.postinst b/debian/maas-rack-controller.postinst
index fcddbb9..db119f1 100644
--- a/debian/maas-rack-controller.postinst
+++ b/debian/maas-rack-controller.postinst
@@ -148,8 +148,8 @@ fix_dns_permissions() {
 }
 
 disable_nginx() {
-    systemctl stop nginx >/dev/null 2>&1 || true
-    systemctl disable nginx >/dev/null 2>&1 || true
+    deb-systemd-invoke stop nginx >/dev/null || true
+    deb-systemd-helper disable nginx >/dev/null || true
 }
 
 # Unconditionally ensure that there is at least an empty configuration
@@ -197,9 +197,9 @@ elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0
     edit_named_options
 fi
 
-deb-systemd-invoke enable maas-rackd >/dev/null || true
+deb-systemd-helper enable maas-rackd >/dev/null || true
 deb-systemd-invoke restart maas-rackd >/dev/null || true
-invoke-rc.d bind9 restart || true
+deb-systemd-invoke restart bind9 >/dev/null || true
 
 db_stop
 
diff --git a/debian/maas-rack-controller.postrm b/debian/maas-rack-controller.postrm
index aa28f1a..ee7a63d 100644
--- a/debian/maas-rack-controller.postrm
+++ b/debian/maas-rack-controller.postrm
@@ -52,5 +52,5 @@ fi
 # MAAS installation disables system nginx so it doesn't
 # prevent MAAS from running our own nginx daemon. As such,
 # on removal, reenable nginx.
-systemctl enable nginx >/dev/null 2>&1 || true
-systemctl start nginx >/dev/null 2>&1 || true
+deb-systemd-helper enable nginx >/dev/null || true
+deb-systemd-invoke start nginx >/dev/null || true
diff --git a/debian/maas-region-api.lintian-overrides b/debian/maas-region-api.lintian-overrides
index 0c504dd..d3598ac 100644
--- a/debian/maas-region-api.lintian-overrides
+++ b/debian/maas-region-api.lintian-overrides
@@ -1,7 +1,7 @@
-maas-region-api: maintainer-script-calls-systemctl
 maas-region-api: command-with-path-in-maintainer-script
 maas-region-api: executable-not-elf-or-script
+maas-region-api: binary-without-manpage usr/sbin/regiond
 maas-region-api: binary-without-manpage usr/sbin/maas-region
 maas-region-api: binary-without-manpage usr/sbin/maas-region-admin
-maas-region-api: binary-without-manpage usr/sbin/maas-generate-winrm-cert
-maas-region-api: font-in-non-font-package
+maas-region-api: binary-without-manpage usr/bin/maas-generate-winrm-cert
+maas-region-api: maintainer-script-should-not-use-recursive-chown-or-chmod
diff --git a/debian/maas-region-api.postinst b/debian/maas-region-api.postinst
index e643650..aae70a6 100644
--- a/debian/maas-region-api.postinst
+++ b/debian/maas-region-api.postinst
@@ -20,8 +20,7 @@ configure_logging() {
 
     # Make sure rsyslog reads our config after creating the
     # destination folder.
-    systemctl restart rsyslog >/dev/null 2>&1 || true
-
+    deb-systemd-invoke restart 'rsyslog.service' >/dev/null || true
 }
 
 configure_libdir() {
diff --git a/debian/maas-region-controller.postinst b/debian/maas-region-controller.postinst
index c4d6c28..582f202 100644
--- a/debian/maas-region-controller.postinst
+++ b/debian/maas-region-controller.postinst
@@ -71,7 +71,7 @@ configure_migrate_maas_dns() {
     maas-region edit_named_options \
         --migrate-conflicting-options --config-path \
         /etc/bind/named.conf.options
-    invoke-rc.d bind9 restart || true
+    deb-systemd-invoke bind9 restart || true
 }
 
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
diff --git a/debian/rules b/debian/rules
index d38b472..51b946b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,14 +10,6 @@ override_dh_auto_test:
 	# do nothing as we don't want the tests to run because they require
 	# internet access
 
-override_dh_installinit:
-	dh_installinit -p maas-region-api --name=maas-regiond --no-start
-	dh_installinit -p maas-rack-controller --name=maas-rackd --no-start
-	dh_installinit -p maas-rack-controller --name=maas-http
-	dh_installinit -p maas-proxy --name=maas-proxy
-	dh_installinit -p maas-dhcp --name=maas-dhcpd
-	dh_installinit -p maas-dhcp --name=maas-dhcpd6
-
 override_dh_systemd_enable:
 	dh_systemd_enable -p maas-region-api --name=maas-regiond
 	dh_systemd_enable -p maas-rack-controller --name=maas-rackd
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index 2e38544..b1e82db 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,3 +1,3 @@
 source: source-is-missing src/maasserver/static/js/bundle/maas-min.js
 source: source-is-missing src/maasserver/static/js/bundle/vendor-min.js
-source: source-is-missing src/maasserver/static/js/macaroon/js-macaroon.js
+source: source-is-missing src/maasserver/static/js/macaroon/js-macaroon.js line length is 514 characters (>512)
diff --git a/src/maasserver/templates/maasserver/base.html b/src/maasserver/templates/maasserver/base.html
old mode 100755
new mode 100644
index fc65508..fc65508
--- a/src/maasserver/templates/maasserver/base.html
+++ b/src/maasserver/templates/maasserver/base.html
diff --git a/src/maasserver/templates/maasserver/index.html b/src/maasserver/templates/maasserver/index.html
old mode 100755
new mode 100644
index ff2b1ae..ff2b1ae
--- a/src/maasserver/templates/maasserver/index.html
+++ b/src/maasserver/templates/maasserver/index.html
diff --git a/src/maasserver/templates/maasserver/zone_list.html b/src/maasserver/templates/maasserver/zone_list.html
old mode 100755
new mode 100644
index f2758b9..f2758b9
--- a/src/maasserver/templates/maasserver/zone_list.html
+++ b/src/maasserver/templates/maasserver/zone_list.html