Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:start-rsync-after-enabling into ubuntu-mirror-charm:master

[Paul Collins]

start rsync after we enable it. get rid of the pointless start and stop hooks

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

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

[Barry Price (barryprice)]

+1

review: Approve

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

Change successfully merged at revision 9ee3925ba4a2c8d5fc227276d185d9e49028681d

diff --git a/hooks/hooks.py b/hooks/hooks.py
index bc7a9d2..4163151 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -283,10 +283,11 @@ def configure_rsync_server():
     file_from_template("rsync-base-cfg.tmpl", "/etc/rsyncd.conf", tmpl_data)
     file_from_template("rsync-mirrors-cfg.tmpl", os.path.join(conf.rsyncd_dir(), "010-ubuntu-mirror.conf"), tmpl_data)
 
-    # Need to tell systemd to enable rsync
+    # Need to tell systemd to enable rsync and then start it
     # but only in 15.04 or greater per https://wiki.ubuntu.com/SystemdForUpstartUsers
     if float(platform.linux_distribution()[1]) >= 15.04:
         check_call('systemctl enable rsync'.split())
+        check_call('systemctl start rsync'.split())
 
     log("CHARM: Finished configuring rsync server")
 
@@ -814,20 +815,6 @@ def upgrade_charm():
     install()
 
 
[e-mail]("start")
-def start():
-    log("CHARM: Starting {}".format(conf.app_name()))
-    service_start("apache2")
-    service_start("rsync")
-
-
[e-mail]("stop")
-def stop():
-    log("CHARM: Stopping {}".format(conf.app_name()))
-    service_stop("apache2")
-    service_stop("rsync")
-
-
 @hooks.hook("nrpe-external-master-relation-changed")
 def nrpe_external_master_relation_changed():
     log("CHARM: Changing nrpe relation for {}".format(conf.app_name()))
diff --git a/hooks/start b/hooks/start
deleted file mode 120000
index 9416ca6..0000000
--- a/hooks/start
+++ /dev/null
@@ -1 +0,0 @@
-hooks.py
\ No newline at end of file
diff --git a/hooks/stop b/hooks/stop
deleted file mode 120000
index 9416ca6..0000000
--- a/hooks/stop
+++ /dev/null
@@ -1 +0,0 @@
-hooks.py
\ No newline at end of file