diff options
author | Michael Scherer <misc@mageia.org> | 2012-01-22 23:06:18 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2012-01-22 23:06:18 +0000 |
commit | 6d852d66105ec2be6948875a1fa098af0cf28c68 (patch) | |
tree | 041dea77e68b3f9f3873fe8116b7753b268e4005 | |
parent | 7ecd4156f07c43b0999600df5d4353d15b0b6588 (diff) | |
download | puppet-6d852d66105ec2be6948875a1fa098af0cf28c68.tar puppet-6d852d66105ec2be6948875a1fa098af0cf28c68.tar.gz puppet-6d852d66105ec2be6948875a1fa098af0cf28c68.tar.bz2 puppet-6d852d66105ec2be6948875a1fa098af0cf28c68.tar.xz puppet-6d852d66105ec2be6948875a1fa098af0cf28c68.zip |
iuse the new get_ldap_servers to get the list of all ldap servers
-rw-r--r-- | modules/openssh/manifests/init.pp | 1 | ||||
-rwxr-xr-x | modules/openssh/templates/ldap-sshkey2file.py | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/modules/openssh/manifests/init.pp b/modules/openssh/manifests/init.pp index c8a12482..f05341b3 100644 --- a/modules/openssh/manifests/init.pp +++ b/modules/openssh/manifests/init.pp @@ -61,6 +61,7 @@ class openssh { symlink_user { $symlink_users: } $ldap_pwfile = "/etc/ldap.secret" + $ldap_servers = get_ldap_servers() local_script { "ldap-sshkey2file.py": content => template("openssh/ldap-sshkey2file.py"), require => Package['python-ldap'] diff --git a/modules/openssh/templates/ldap-sshkey2file.py b/modules/openssh/templates/ldap-sshkey2file.py index af29a203..a36775f1 100755 --- a/modules/openssh/templates/ldap-sshkey2file.py +++ b/modules/openssh/templates/ldap-sshkey2file.py @@ -12,7 +12,10 @@ except ImportError, e: basedn="<%= dc_suffix %>" peopledn="ou=people,%s" % basedn -uris=['ldap://ldap.<%= domain %>'] +<%- + ldap_servers.map! { |l| "'ldaps://#{l}'" } +-%> +uris=[<%= ldap_servers.join(", ") %>] random.shuffle(uris) uri = " ".join(uris) timeout=5 |