Make gerrit email server configurable

Sometimes people need to send mail through a smarthost. Allow that.

Change-Id: I66ff43a3ca4fce63500755d16be3aa891d55bc75
This commit is contained in:
Monty Taylor 2013-07-18 13:25:27 -07:00
parent 43a208abb3
commit 040073e746
4 changed files with 18 additions and 1 deletions
modules
exim
manifests
templates
gerrit
manifests
templates

@ -3,6 +3,7 @@ class exim(
$queue_interval = '30m',
$queue_run_max = '5',
$queue_smtp_domains = '',
$smarthost = '',
$sysadmin = []
) {

@ -606,12 +606,21 @@ mailman_router:
# If the DNS lookup fails, no further routers are tried because of the no_more
# setting, and consequently the address is unrouteable.
<% if smarthost -%>
smarthost:
driver = manualroute
domains = !+local_domains
transport = remote_smtp
route_list = * <%= smarthost %>
no_more
<% else -%>
dnslookup:
driver = dnslookup
domains = ! +local_domains
transport = remote_smtp
ignore_target_hosts = 0.0.0.0 : 127.0.0.0/8
no_more
<% end -%>
# The remaining routers handle addresses in the local domain(s), that is those
# domains that are defined by "domainlist local_domains" above.

@ -18,6 +18,10 @@
# The URL to use for OpenID in SSO mode.
# email:
# The email address Gerrit should use when sending mail.
# smtpserver:
# The smtp server that Gerrit should send mail through.
# sendemail_from:
# gerrit.conf value for sendemail.from.
# database_poollimit:
# container_heaplimit:
# core_packedgitopenfiles:
@ -88,6 +92,8 @@ class gerrit(
$ssh_project_rsa_pubkey_contents = '', # If left empty will not create file.
$openidssourl = 'https://login.launchpad.net/+openid',
$email = '',
$smtpserver = 'localhost',
$sendemail_from = 'MIXED',
$database_poollimit = '',
$container_heaplimit = '',
$core_packedgitopenfiles = '',

@ -19,7 +19,8 @@
cookieSecure = true
contributorAgreements = true
[sendemail]
smtpServer = localhost
smtpServer = <%= smtpserver %>
from = <%= sendemail_from %>
[container]
user = gerrit2
javaHome = <%= java_home %>