diff --git a/roles/provision_homedir/tasks/main.yml b/roles/provision_homedir/tasks/main.yml index ced40255ba4037daf4129e2d200c74e59d3bc4ab..2fffe4ec5b0123f57bf37e6c3adf7cf08ac846a2 100644 --- a/roles/provision_homedir/tasks/main.yml +++ b/roles/provision_homedir/tasks/main.yml @@ -19,5 +19,5 @@ # the lockfile for makeing home directories should be located on the shared directory where the home directories will be created. Otherwise it will be racey - name: provision_homedir cron job - cron: name=provision_homedir job="/usr/bin/flock -x -n /home/provision.lck -c {{ provision_homedir }}" user=root minute=*/30 state=present + cron: name=provision_homedir job="/usr/bin/flock -x -n {{ mnthome }}/home/provision.lck -c {{ provision_homedir }}" user=root minute=*/30 state=present sudo: true diff --git a/roles/provision_homedir/templates/provision_homedir.py.j2 b/roles/provision_homedir/templates/provision_homedir.py.j2 index e998d712d5d37c3ec6cbefee10ff6a837222e25c..bf61ed8464c880aa5baa17837f25a4d860573576 100644 --- a/roles/provision_homedir/templates/provision_homedir.py.j2 +++ b/roles/provision_homedir/templates/provision_homedir.py.j2 @@ -63,14 +63,14 @@ s.bindpw="{{ ldapBindDNPassword }}" s.baseDN="{{ ldapBase }}" s.searchFilter = "{{ search_filter }}" homeDirEntry= "{{ homeDirEntry }}" -homebase = "{{ homebase }}" +mnthome = "{{ mnthome }}" users=get_users(s) for user in users: try: - if homebase != "": - path=homebase+"/"+users[user].entry[homeDirEntry][0].rsplit("/",1)[1] + if mnthome != "": + path=mnthome+"/"+users[user].entry[homeDirEntry][0].rsplit("/",1)[1] else: path=users[user].entry[homeDirEntry][0] mk_homedir(path,int(users[user].entry['uidNumber'][0]),int(users[user].entry['gidNumber'][0])) diff --git a/roles/provision_homedir/vars/main.yml b/roles/provision_homedir/vars/main.yml index 1bd13c0514a0e2593bae2f10b4745af49cc03690..023e5a880315bcd43a34b9974848a52d084c5c28 100644 --- a/roles/provision_homedir/vars/main.yml +++ b/roles/provision_homedir/vars/main.yml @@ -3,4 +3,4 @@ use_active_directory: False provision_homedir: /usr/local/sbin/provision_homedir.py homeDirEntry: "{% if use_active_directory %}unixHomeDirectory{% else %}homeDirectory{% endif %}" search_filter: "{% if use_active_directory %}(unixHomeDirectory=*){% else %}(objectClass=posixAccount){% endif %}" -homebase: "" +mnthome: "{% if mntpt %}{{ mntpt }}{% else %}''{% endif %}"