Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386265 )

Change subject: gerrit: temp re-enable ssh on all IPs
......................................................................


gerrit: temp re-enable ssh on all IPs

Idbc1654033fb075eded disabled SSHd on slaves,
and made it listen only on the service IP on masters.

Apparently ci-slave-labs instances use the wrong IP
(cobalt.wikimedia.org) to connect to,
but call it gerrit.wikimedia.org.

For now, revert the part that it doesn't listen on "*" but keep
the part that it's disabled on slaves.

Change-Id: Iea3c6d3092341a82d3ceb92a575914d82bef7193
---
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
  Dzahn: Verified; Looks good to me, approved



diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index b25dbf3..6133a9b 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -172,7 +172,7 @@
     <%- if @slave %>
     listenAddress = off
     <%- else -%>
-    listenAddress = <%= @host %>:29418
+    listenAddress = *:29418
     <%- end -%>
 
     threads = 8

-- 
To view, visit https://gerrit.wikimedia.org/r/386265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iea3c6d3092341a82d3ceb92a575914d82bef7193
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to