Merge lp:~joetalbott/charms/trusty/snappy-proposed-image-builder/create_home into lp:~canonical-ci-engineering/charms/trusty/snappy-proposed-image-builder/trunk

[Joe Talbott]

Create worker's home (needed by u-d-f) and point to the correct u-d-f binary in the sudoers file.

Create worker's home (needed by u-d-f) and point to the correct u-d-f binary in the sudoers file.

[Francis Ginther (fginther)]

Approve.

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-06-03 18:14:36 +0000
+++ hooks/actions.py	2015-06-04 15:35:31 +0000
@@ -1,5 +1,8 @@
 import base64
+import errno
+import grp
 import os
+import pwd
 import shutil
 import subprocess
 
@@ -67,6 +70,19 @@
     hookenv.log('Creating service user: %s', username)
     adduser(username)
 
+    # create user's home directory if it doesn't exist.
+    home = os.path.exists(os.path.join('/home', username))
+    try:
+        os.makedirs(home, 0o755)
+    except OSError as e:
+        if e.errno != errno.EEXIST:
+            raise
+
+    # make sure the user owns their home.
+    group_info = grp.getgrnam(username)
+    user_info = pwd.getpwdnam(username)
+    os.chown(home, user_info['pw_uid'], group_info['gr_gid'])
+
 
 def install_python_packages(service_name):
     env_dir = os.path.join(_service_dir(), 've')

=== modified file 'templates/sudoers.conf'
--- templates/sudoers.conf	2015-05-27 13:56:25 +0000
+++ templates/sudoers.conf	2015-06-04 15:35:31 +0000
@@ -1,4 +1,4 @@
 # Specifically added for ubuntu-device-flash command for snappy-proposed-image-builder
 
-core-worker ALL=(ALL) NOPASSWD: /usr/bin/ubuntu-device-flash, /bin/rm
+core-worker ALL=(ALL) NOPASSWD: /srv/{{ environment }}/snappy-proposed-image-builder/ubuntu-device-flash, /usr/sbin/chroot, /bin/rm