Merged oherrala/puppet into master

This commit is contained in:
Ossi Herrala 2013-02-07 12:57:56 +02:00
commit 9b9911646b

View file

@ -40,7 +40,7 @@ syncrepl rid=2
provider=<%= master %> provider=<%= master %>
type=refreshAndPersist type=refreshAndPersist
retry="10 10 60 +" retry="10 10 60 +"
searchbase="<%= ldap_basedn %>" searchbase="<%= name %>"
filter="(objectClass=*)" filter="(objectClass=*)"
scope="sub" scope="sub"
sizelimit=500000 sizelimit=500000
@ -48,7 +48,7 @@ syncrepl rid=2
schemachecking="off" schemachecking="off"
bindmethod="simple" bindmethod="simple"
tls_reqcert="never" tls_reqcert="never"
binddn="uid=replicator,cn=config,<%= ldap_basedn %>" binddn="uid=replicator,cn=config,<%= name %>"
credentials="<%= syncpw %>" credentials="<%= syncpw %>"
updateref <%= master %> updateref <%= master %>
<% end -%> <% end -%>