From 2b2106f598d81990fd300de7486204b75e49e264 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Tue, 23 Sep 2014 11:10:44 +0100 Subject: Revert "Temporary hack to work around LDAP server sync problem" This reverts commit cc302084ccf54fb8f067f8dd5d7f7c07ed50b019. Slave LDAP now back cookin' on gas! --- modules/openssh/templates/ldap-sshkey2file.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'modules/openssh/templates') 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 -- cgit v1.2.1