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

Change subject: gerrit: if @ipv6 is not set don't let gerrit-sshd listen on it
......................................................................


gerrit: if @ipv6 is not set don't let gerrit-sshd listen on it

When you did not give a ipv6 address in the config
section it would do

listenAddress = []:29418

which is wrong and invalid.

Bug: T182705
Change-Id: I23b5d3bfd3637b74978a0e160590114839979e2e
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  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 11ef99b..13fec20 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -179,8 +179,10 @@
     listenAddress = off
     <%- else -%>
     listenAddress = <%= @host %>:29418
+    <%- if @ipv6 %>
     listenAddress = [<%= @ipv6 %>]:29418
     <%- end -%>
+    <%- end -%>
     threads = 8
     batchThreads = 2
     idleTimeout = 864000

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I23b5d3bfd3637b74978a0e160590114839979e2e
Gerrit-PatchSet: 7
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
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

Reply via email to