Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/385491 )
Change subject: Gerrit: move LDAP spaces around for hostnames
......................................................................
Gerrit: move LDAP spaces around for hostnames
Current syntax leaves us with a trailing space which fights with
Gerrit's init process. This ends up leaving us with pointless diffs
on the subsequent puppet run after an upgrade.
Change-Id: I19ef45c1853ebb87bc3f3db4936f73dd960b22ca
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Paladox: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index 6133a9b..bd85289 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -116,7 +116,7 @@
commentOnPatchSetCreated = false
commentOnRefUpdatedGitWeb = false
[ldap]
- server = <% @ldap_hosts.each do |ldap_host| %>ldaps://<%= ldap_host %> <%
end %>
+ server =<% @ldap_hosts.each do |ldap_host| %> ldaps://<%= ldap_host %><%
end %>
accountBase = ou=people,<%= @ldap_base_dn %>
accountPattern = (&(objectClass=person)(cn=${username}))
accountFullName = cn
--
To view, visit https://gerrit.wikimedia.org/r/385491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I19ef45c1853ebb87bc3f3db4936f73dd960b22ca
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
