aboutsummaryrefslogtreecommitdiffstats
path: root/modules/openssh
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2014-09-16 19:12:12 +0100
committerColin Guthrie <colin@mageia.org>2014-09-16 19:12:12 +0100
commitcc302084ccf54fb8f067f8dd5d7f7c07ed50b019 (patch)
tree984f0caec4b1b4a6b2f4627d991c520adbd02517 /modules/openssh
parentc6ebc29b9c0729d259bde1f5ccb1ae2c287c2565 (diff)
downloadpuppet-cc302084ccf54fb8f067f8dd5d7f7c07ed50b019.tar
puppet-cc302084ccf54fb8f067f8dd5d7f7c07ed50b019.tar.gz
puppet-cc302084ccf54fb8f067f8dd5d7f7c07ed50b019.tar.bz2
puppet-cc302084ccf54fb8f067f8dd5d7f7c07ed50b019.tar.xz
puppet-cc302084ccf54fb8f067f8dd5d7f7c07ed50b019.zip
Temporary hack to work around LDAP server sync problem
Diffstat (limited to 'modules/openssh')
-rwxr-xr-xmodules/openssh/templates/ldap-sshkey2file.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/openssh/templates/ldap-sshkey2file.py b/modules/openssh/templates/ldap-sshkey2file.py
index e393e29b..ec7f7c7f 100755
--- a/modules/openssh/templates/ldap-sshkey2file.py
+++ b/modules/openssh/templates/ldap-sshkey2file.py
@@ -17,6 +17,12 @@ 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