opendev/puppet-gerrit
Code Issues Proposed changes

Merge "Allow puppet to configure the Gerrit's sendmail.includeDiff option"

Browse Source
This commit is contained in:
Jenkins
2016-01-04 23:05:26 +00:00
committed by Gerrit Code Review
parent f7b9c992cd a26f55999a
commit 12b52c3d17
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@@ -29,6 +29,8 @@
# The smtp server that Gerrit should send mail through. # The smtp server that Gerrit should send mail through.
# sendemail_from: # sendemail_from:
# gerrit.conf value for sendemail.from. # gerrit.conf value for sendemail.from.
# sendemail_indclude_diff:
# Config emails to includes the complete unified diff of the change
# database_poollimit: # database_poollimit:
# container_heaplimit: # container_heaplimit:
# container_javaoptions: # container_javaoptions:
@@ -144,6 +146,7 @@ class gerrit(
$email = '', $email = '',
$smtpserver = 'localhost', $smtpserver = 'localhost',
$sendemail_from = 'MIXED', $sendemail_from = 'MIXED',
$sendemail_include_diff = false,
$database_poollimit = '', $database_poollimit = '',
$container_heaplimit = '', $container_heaplimit = '',
$container_javaoptions = '', $container_javaoptions = '',
@@ -313,6 +316,9 @@ class gerrit(
# Template uses: # Template uses:
# - $mysql_host # - $mysql_host
# - $canonicalweburl # - $canonicalweburl
# - $smtpserver
# - $sendemail_from
# - $sendemail_include_diff
# - $database_poollimit # - $database_poollimit
# - $gerrit_contributor_agreement # - $gerrit_contributor_agreement
# - $gerrit_auth_type # - $gerrit_auth_type

1
templates/gerrit.config.erb
View File

@@ -42,6 +42,7 @@
[sendemail] [sendemail]
smtpServer = <%= @smtpserver %> smtpServer = <%= @smtpserver %>
from = <%= @sendemail_from %> from = <%= @sendemail_from %>
includeDiff = <%= @sendemail_include_diff %>
[container] [container]
user = gerrit2 user = gerrit2
javaHome = <%= @java_home %> javaHome = <%= @java_home %>