Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/384901 )
Change subject: Gerrit: Replace certificates with tokens for its-phabricator
......................................................................
Gerrit: Replace certificates with tokens for its-phabricator
Requires chad +1.
Bug: T178385
Change-Id: Ia0a847ce2adf4e78fe076202fc7ef50cbe318707
---
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/gerrit.config.erb
M modules/gerrit/templates/secure.config.erb
3 files changed, 6 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index 2ae8708..e4e7d40 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -40,6 +40,7 @@
$email_key = $passwords::gerrit::gerrit_email_key
$db_pass = $passwords::gerrit::gerrit_db_pass
$phab_cert = $passwords::gerrit::gerrit_phab_cert
+ $phab_token = $passwords::gerrit::gerrit_phab_token
# Setup LDAP
include ::ldap::role::config::labs
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index 85f87d6..6cd2a01 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -106,9 +106,11 @@
maxWait = 5 min
[index]
type = LUCENE
+# User gerritbot
[its-phabricator]
url = https://phabricator.wikimedia.org/
- username = gerritbot
+ # To be removed once we upgrade to 2.14+.
+ user = gerritbot
commentOnChangeAbandoned = false
commentOnChangeMerged = false
commentOnChangeRestored = false
diff --git a/modules/gerrit/templates/secure.config.erb
b/modules/gerrit/templates/secure.config.erb
index c28632b..eea1f0d 100644
--- a/modules/gerrit/templates/secure.config.erb
+++ b/modules/gerrit/templates/secure.config.erb
@@ -6,4 +6,6 @@
[auth]
registerEmailPrivateKey = <%= @email_key %>
[its-phabricator]
+ # to be removed once weupgrade to 2.14+
certificate = <%= @phab_cert %>
+ token = <%= @phab_token %>
--
To view, visit https://gerrit.wikimedia.org/r/384901
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0a847ce2adf4e78fe076202fc7ef50cbe318707
Gerrit-PatchSet: 10
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: 20after4 <mmod...@wikimedia.org>
Gerrit-Reviewer: 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
