Chad has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/296683

Change subject: Gerrit: Stop customizing ssh port. It's not like we're changing 
it
......................................................................

Gerrit: Stop customizing ssh port. It's not like we're changing it

Change-Id: I393918678abcc39ad43bbc3e014a96924cd44910
---
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/gerrit.config.erb
2 files changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/296683/1

diff --git a/modules/gerrit/manifests/jetty.pp 
b/modules/gerrit/manifests/jetty.pp
index c120542..3728bda 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -5,7 +5,6 @@
     $url = "https://${::gerrit::host}/r";,
     $db_name = 'reviewdb',
     $db_user = 'gerrit',
-    $ssh_port = '29418',
     $git_dir = 'git'
     ) {
 
diff --git a/modules/gerrit/templates/gerrit.config.erb 
b/modules/gerrit/templates/gerrit.config.erb
index aacf4bb..349d3ba 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -35,7 +35,7 @@
     javaHome = /usr/lib/jvm/java-7-openjdk-amd64/jre
     heapLimit = 20g
 [sshd]
-    listenAddress = *:<%= @ssh_port %>
+    listenAddress = *:29418
     threads = 8
     batchThreads = 2
     idleTimeout = 864000

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I393918678abcc39ad43bbc3e014a96924cd44910
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>

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

Reply via email to