Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:always-install-scripts into ubuntu-mirror-charm:master

[Paul Collins]

rename copy_files to configure_scripts, call it always to ensure scripts are up to date

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

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

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

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

Change successfully merged at revision ba4a39b8901bb4e750a1ee4caf6e8e0bed5a3e93

diff --git a/hooks/hooks.py b/hooks/hooks.py
index a72d240..577fbff 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -128,7 +128,7 @@ def check_output(cmd):
         return None
 
 
-def copy_files():
+def configure_scripts():
     mkdir(conf.script_dir())
     for script in scripts_to_copy:
         src = os.path.join(charm_dir(), "files", script)
@@ -777,8 +777,6 @@ def configure_user():
         mirror_userinfo = adduser(conf.mirror_user(), system_user=True)
         if not os.path.isdir(mirror_userinfo.pw_dir):
             mkdir(mirror_userinfo.pw_dir, owner=conf.mirror_user())
-        copy_files()
-
 
 def configure_directories():
     if not os.path.isdir("/srv/ftp.root"):
@@ -791,6 +789,7 @@ def install():
     log("CHARM: Installing {}".format(conf.app_name()))
     apt_install(required_pkgs, options=['--force-yes'])
     configure_user()
+    configure_scripts()
     configure_directories()
     for module in apache_modules:
         check_call(["/usr/sbin/a2enmod", module])
@@ -800,6 +799,7 @@ def install():
 def config_changed():
     log("CHARM: Configuring {}".format(conf.app_name()))
     configure_user()
+    configure_scripts()
     configure_directories()
     configure_rsync_client()
     configure_rsync_server()