Merge ~deej/ubuntu-mirror-charm/+git/add-user-fix:master into ubuntu-mirror-charm:master

[David Lawson]

Break out user and root directory creation into their own functions called both from the install hook and config-changed ala the other configuration functions.

Break out user and root directory creation into their own functions called both from the install hook and config-changed ala the other configuration functions.

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

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

[Tom Haddon (mthaddon)]

One comment inline

[Tom Haddon (mthaddon)]

LGTM, nit about trailing comma on write_file

review: Approve

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

Change successfully merged at revision 67efd529c3684cddcfbfcbeb92f5b1874aa27fb4

diff --git a/hooks/hooks.py b/hooks/hooks.py
index 6790005..eab6c23 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -16,7 +16,19 @@ import sys
 import yaml
 import platform
 
-from charmhelpers.core.host import service_start, service_stop, service_reload, service_restart, adduser, symlink, mkdir, write_file, lsb_release
+from charmhelpers.core.host import (
+    adduser,
+    chownr,
+    lsb_release,
+    mkdir,
+    service_start,
+    service_stop,
+    service_reload,
+    service_restart,
+    symlink,
+    user_exists,
+    write_file,
+)
 from charmhelpers.core.hookenv import Hooks, log, charm_dir, relation_set, local_unit, is_relation_made, relation_id, relation_ids
 from charmhelpers.core import sysctl
 from charmhelpers.fetch import apt_install
@@ -725,14 +737,26 @@ def configure_sysctl():
     sysctl.create(yaml.dump(sysctl_settings), '/etc/sysctl.d/90-ubuntu-mirror.conf')
 
 
+def configure_user():
+    if not user_exists(conf.mirror_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"):
+        mkdir("/srv/ftp.root")
+    chownr("/srv/ftp.root", conf.mirror_user(), conf.mirror_user())
+
+
 @hooks.hook("install.real")
 def install():
     log("CHARM: Installing {}".format(conf.app_name()))
     apt_install(required_pkgs, options=['--force-yes'])
-    mirror_userinfo = adduser(conf.mirror_user(), system_user=True)
-    mkdir(mirror_userinfo.pw_dir, owner=conf.mirror_user())
-    copy_files()
-    mkdir("/srv/ftp.root")
+    configure_user()
+    configure_directories()
     for module in apache_modules:
         check_call(["/usr/sbin/a2enmod", module])
 
@@ -740,6 +764,8 @@ def install():
 @hooks.hook("config-changed")
 def config_changed():
     log("CHARM: Configuring {}".format(conf.app_name()))
+    configure_user()
+    configure_directories()
     configure_rsync_client()
     configure_rsync_server()
     configure_apache()