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

Gerrit 2.11 has a new sendmail.includeDiff[1] option that when set to true
will add the unified diff info of that change in the notification email.
This change allows puppet to configure this setting.

[1] https://gerrit-documentation.storage.googleapis.com/Documentation/
        2.11/config-gerrit.html#sendemail.includeDiff

Change-Id: I28043548e5ec9b00e9446445efb0299792ce5540
This commit is contained in:
Khai Do
2015-12-21 16:43:40 -08:00
parent 69b1212fb6
commit a26f55999a
2 changed files with 7 additions and 0 deletions

View File

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

View File

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