Merge lp:~ltrager/maas/restart-rsyslog-common into lp:~maas-maintainers/maas/packaging

[Lee Trager]

Restart rsyslog in maas-common

While maas-rsyslog.conf is shipped in maas-common, which is required by both maas-region-api and maas-rack-controller, only maas-region-api was restarting rsyslog to enable the new config. This restarts rsyslog in maas-common so the config is loaded for both maas-region-api and maas-rack-controller.

[Brendan Donegan (brendan-donegan)]

Looks sensible - not sure there's a way we can add a test without getting quite high-level, so will leave that for the time being.

review: Approve

[Andres Rodriguez (andreserl)]

Could you please make sure that maas-common depends on rsyslog (in debian/control) and I guess that you'd need to drop the dependency from maas-region-api and maas-rack-controller. Also, see inline.

review: Needs Fixing

[Lee Trager (ltrager)]

Thanks for catching the dependencies, I completely forgot about that. I've also updated the postinst script as you suggested.

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2016-04-16 02:28:29 +0000
+++ debian/control	2016-05-25 18:12:16 +0000
@@ -56,7 +56,8 @@
 
 Package: maas-common
 Architecture: all
-Depends: ${misc:Depends}
+Depends: rsyslog,
+         ${misc:Depends}
 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Description: MAAS server common files
@@ -80,7 +81,6 @@
          python3-maas-provisioningserver (= ${binary:Version}),
          python3-petname,
          python3-requests,
-         rsyslog,
          ubuntu-cloudimage-keyring,
          ${misc:Depends},
          ${python3:Depends}
@@ -194,7 +194,6 @@
          python3-tempita,
          python3-twisted,
          python3-zope.interface,
-         rsyslog,
          syslinux-common,
          tgt,
          uuid-runtime,
 
=== modified file 'debian/maas-common.postinst'
--- debian/maas-common.postinst	2016-04-01 18:27:46 +0000
+++ debian/maas-common.postinst	2016-05-25 18:12:16 +0000
@@ -10,6 +10,8 @@
         touch /var/log/maas/maas.log
     fi
     chown syslog:syslog /var/log/maas/maas.log
+    # Make sure rsyslog reads our config
+    systemctl restart rsyslog >/dev/null 2>&1 || true
 }
 
 configure_lib_dir() {
 
=== modified file 'debian/maas-region-api.postinst'
--- debian/maas-region-api.postinst	2016-03-31 23:22:22 +0000
+++ debian/maas-region-api.postinst	2016-05-25 18:12:16 +0000
@@ -31,8 +31,6 @@
     # Create log directory base
     mkdir -p /var/log/maas/rsyslog
     chown -R syslog:syslog /var/log/maas/rsyslog
-    # Make sure rsyslog reads our config
-    invoke-rc.d rsyslog restart
 
     # apache2 log symlinks
     ln -sf /var/log/apache2 /var/log/maas/