diff options
| author | Colin Guthrie <colin@mageia.org> | 2014-09-23 11:10:44 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2014-09-23 11:10:44 +0100 |
| commit | 2b2106f598d81990fd300de7486204b75e49e264 (patch) | |
| tree | eb5f4d644bc63f82159f540b3503cc4ac632a767 | |
| parent | 6a308186a45cdeaf0a678664f88e95d252e8e259 (diff) | |
| download | puppet-2b2106f598d81990fd300de7486204b75e49e264.tar puppet-2b2106f598d81990fd300de7486204b75e49e264.tar.gz puppet-2b2106f598d81990fd300de7486204b75e49e264.tar.bz2 puppet-2b2106f598d81990fd300de7486204b75e49e264.tar.xz puppet-2b2106f598d81990fd300de7486204b75e49e264.zip | |
Revert "Temporary hack to work around LDAP server sync problem"
This reverts commit cc302084ccf54fb8f067f8dd5d7f7c07ed50b019.
Slave LDAP now back cookin' on gas!
| -rwxr-xr-x | modules/openssh/templates/ldap-sshkey2file.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/modules/openssh/templates/ldap-sshkey2file.py b/modules/openssh/templates/ldap-sshkey2file.py index ec7f7c7f..e393e29b 100755 --- a/modules/openssh/templates/ldap-sshkey2file.py +++ b/modules/openssh/templates/ldap-sshkey2file.py @@ -17,12 +17,6 @@ peopledn="ou=people,%s" % basedn ldap_servers.map! { |l| "'ldaps://#{l}'" } -%> uris=[<%= ldap_servers.join(", ") %>] -# Temporoary hack because ldap-slave-1 is out of sync... no idea how to resync it :( -# Ask me about it or look at results from: -# ldapsearch -H ldaps://ldap-slave-1.mageia.org -D uid=$USER,ou=People,dc=mageia,dc=org -W -b uid=blue_prawn,ou=People,dc=mageia,dc=org -# vs -# ldapsearch -H ldaps://ldap-master.mageia.org -D uid=$USER,ou=People,dc=mageia,dc=org -W -b uid=blue_prawn,ou=People,dc=mageia,dc=org -uris=['ldaps://ldap-master.mageia.org'] random.shuffle(uris) uri = " ".join(uris) timeout=5 |