Mailing List Archive

Chad has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/406145 )

Change subject: Gerrit: Allow enabling of tls/ssl (keep default of none for now)
......................................................................

Gerrit: Allow enabling of tls/ssl (keep default of none for now)

Change-Id: Ib105feca46c7e9602dd595228fb3518e481d7e3b
---
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/gerrit.config.erb
2 files changed, 2 insertions(+), 0 deletions(-)


git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/45/406145/1

diff --git a/modules/gerrit/manifests/jetty.pp b/modules/gerrit/manifests/jetty.pp
index dc35759..8842aab 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -18,6 +18,7 @@
$log_port = '4560',
$config = 'gerrit.config.erb',
$git_open_files = 20000,
+ $smtp_encryption = 'none',
) {

group { 'gerrit2':
diff --git a/modules/gerrit/templates/gerrit.config.erb b/modules/gerrit/templates/gerrit.config.erb
index d7ab5c6..31ae707 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -173,6 +173,7 @@
includeDiff = true
connectTimeout = 1 min
smtpServer = <%= @mail_smarthost[0] %>
+ smtpEncryption = <%= @smtp_encryption %>
[sshd]
<%- if @slave %>
listenAddress = off

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

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

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