Merge lp:~cjwatson/turku-charms/turku-agent-charm-more-systemd-units into lp:turku-charms/turku-agent-charm

[Colin Watson]

Enable new systemd units.

These units were added in the version of turku-agent that was synced in r14, but the installation code wasn't updated to match, so systems running systemd would never actually ask turku to perform backups.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Paul Collins (pjdc)]

review: Approve (lgtm)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 14

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2019-05-24 05:57:40 +0000
+++ hooks/hooks.py	2019-07-04 23:45:30 +0000
@@ -44,15 +44,22 @@
 
     # Systemd configuration
     if os.path.isdir('/etc/systemd/system'):
-        shutil.copyfile('files/turku-agent/turku-agent-rsyncd.service',
-                        '/etc/systemd/system/turku-agent-rsyncd.service')
-        # Even if the directory exists, Systemd may not be installed or
-        # enabled.  So don't fail on this systemctl command.
-        try:
-            subprocess.call(['systemctl', 'enable', 'turku-agent-rsyncd'])
-        except OSError as e:
-            if e.errno != 2:
-                raise
+        for unit in (
+                'turku-agent-ping.service',
+                'turku-agent-ping.timer',
+                'turku-agent-rsyncd.service',
+                'turku-update-config.service',
+                'turku-update-config.timer',
+                ):
+            shutil.copyfile(os.path.join('files/turku-agent', unit),
+                            os.path.join('/etc/systemd/system', unit))
+            # Even if the directory exists, Systemd may not be installed or
+            # enabled.  So don't fail on this systemctl command.
+            try:
+                subprocess.call(['systemctl', 'enable', unit])
+            except OSError as e:
+                if e.errno != 2:
+                    raise
 
 
 def configure(juju_stored=None):