Skip to content
Snippets Groups Projects
Commit 42290612 authored by Chris Hines's avatar Chris Hines
Browse files

update provision_homedir, pass the mntpt variable to indicate where homedirectories are mounted

parent ecd69065
No related branches found
No related tags found
1 merge request!68update provision_homedir, pass the mntpt variable to indicate where homedirectories are mounted
...@@ -19,5 +19,5 @@ ...@@ -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 # 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 - 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 sudo: true
...@@ -63,14 +63,14 @@ s.bindpw="{{ ldapBindDNPassword }}" ...@@ -63,14 +63,14 @@ s.bindpw="{{ ldapBindDNPassword }}"
s.baseDN="{{ ldapBase }}" s.baseDN="{{ ldapBase }}"
s.searchFilter = "{{ search_filter }}" s.searchFilter = "{{ search_filter }}"
homeDirEntry= "{{ homeDirEntry }}" homeDirEntry= "{{ homeDirEntry }}"
homebase = "{{ homebase }}" mnthome = "{{ mnthome }}"
users=get_users(s) users=get_users(s)
for user in users: for user in users:
try: try:
if homebase != "": if mnthome != "":
path=homebase+"/"+users[user].entry[homeDirEntry][0].rsplit("/",1)[1] path=mnthome+"/"+users[user].entry[homeDirEntry][0].rsplit("/",1)[1]
else: else:
path=users[user].entry[homeDirEntry][0] path=users[user].entry[homeDirEntry][0]
mk_homedir(path,int(users[user].entry['uidNumber'][0]),int(users[user].entry['gidNumber'][0])) mk_homedir(path,int(users[user].entry['uidNumber'][0]),int(users[user].entry['gidNumber'][0]))
......
...@@ -3,4 +3,4 @@ use_active_directory: False ...@@ -3,4 +3,4 @@ use_active_directory: False
provision_homedir: /usr/local/sbin/provision_homedir.py provision_homedir: /usr/local/sbin/provision_homedir.py
homeDirEntry: "{% if use_active_directory %}unixHomeDirectory{% else %}homeDirectory{% endif %}" homeDirEntry: "{% if use_active_directory %}unixHomeDirectory{% else %}homeDirectory{% endif %}"
search_filter: "{% if use_active_directory %}(unixHomeDirectory=*){% else %}(objectClass=posixAccount){% endif %}" search_filter: "{% if use_active_directory %}(unixHomeDirectory=*){% else %}(objectClass=posixAccount){% endif %}"
homebase: "" mnthome: "{% if mntpt %}{{ mntpt }}{% else %}''{% endif %}"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment