Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/306304
Change subject: Revert "Gerrit: make auth_type configurable for labs"
......................................................................
Revert "Gerrit: make auth_type configurable for labs"
This reverts commit 372642acfef64486abfd4134227e2210d6a16f58.
Change-Id: I495d24b72d746956ad9b8f32290e71f169617dac
---
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/gerrit.config.erb
M modules/gerrit/templates/secure.config.erb
3 files changed, 1 insertion(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/306304/1
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index e0658c5..0c79fdc 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -7,7 +7,6 @@
$git_dir = 'git',
$ssh_host_key = undef,
$heap_limit = '28g',
- $auth_type = 'LDAP',
) {
include nrpe
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index 0341212..bf865b4 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -15,11 +15,9 @@
username = <%= @db_user %>
url = jdbc:mysql://<%= @db_host %>/<%= @db_name
%>?characterSetResults=utf8&characterEncoding=utf8&connectionCollation=utf8_unicode_ci
[auth]
- type = <%= @auth_type %>
+ type = LDAP
cookieSecure = true
-<%- if @auth_type == 'LDAP' -%>
registerUrl =
https://wikitech.wikimedia.org/w/index.php?title=Special:UserLogin&returnto=Help%3AGetting+Started&type=signup
-
[ldap]
server = <% @ldap_hosts.each do |ldap_host| %>ldaps://<%= ldap_host %> <%
end %>
accountBase = ou=people,<%= @ldap_base_dn %>
@@ -28,7 +26,6 @@
groupBase = ou=groups,<%= @ldap_base_dn %>
groupMemberPattern = (&(objectClass=groupOfNames)(member=${dn}))
groupScope = one
-<%- end -%>
[sendemail]
includeDiff = true
smtpServerPort = 25
diff --git a/modules/gerrit/templates/secure.config.erb
b/modules/gerrit/templates/secure.config.erb
index d46cc50..c28632b 100644
--- a/modules/gerrit/templates/secure.config.erb
+++ b/modules/gerrit/templates/secure.config.erb
@@ -1,10 +1,8 @@
[database]
password = <%= @db_pass %>
-<%- if @auth_type == 'LDAP' -%>
[ldap]
username = <%= @ldap_proxyagent %>
password = <%= @ldap_proxyagent_pass %>
-<%- end -%>
[auth]
registerEmailPrivateKey = <%= @email_key %>
[its-phabricator]
--
To view, visit https://gerrit.wikimedia.org/r/306304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I495d24b72d746956ad9b8f32290e71f169617dac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
