Merge "Add SMTP configuration options for Zanata"

This commit is contained in:
Jenkins 2015-04-16 23:19:46 +00:00 committed by Gerrit Code Review
commit a2dec06d4d
2 changed files with 25 additions and 0 deletions

View File

@ -37,6 +37,13 @@ class zanata(
$zanata_listeners = [],
$zanata_smtp_host = '',
$zanata_smtp_port = '',
$zanata_smtp_username = '',
$zanata_smtp_password = '',
$zanata_smtp_tls = '',
$zanata_smtp_ssl = '',
) {
$zanata_file = inline_template('<%= File.basename(@zanata_url) %>')

View File

@ -425,6 +425,24 @@
<simple name="java:global/zanata/files/document-storage-directory" value="<%= @zanata_storage_dir %>/files"/>
<% if @zanata_default_from_address != '' -%>
<simple name="java:global/zanata/email/default-from-address" value="<%= @zanata_default_from_address %>"/>
<% end -%>
<% if @zanata_smtp_host != '' -%>
<simple name="java:global/zanata/smtp/host" value="<%= @zanata_smtp_host %>" />
<% end -%>
<% if @zanata_smtp_port != '' -%>
<simple name="java:global/zanata/smtp/port" value="<%= @zanata_smtp_port %>" />
<% end -%>
<% if @zanata_smtp_username != '' -%>
<simple name="java:global/zanata/smtp/username" value="<%= @zanata_smtp_username %>" />
<% end -%>
<% if @zanata_smtp_password != '' -%>
<simple name="java:global/zanata/smtp/password" value="<%= @zanata_smtp_password %>" />
<% end -%>
<% if @zanata_smtp_tls != '' -%>
<simple name="java:global/zanata/smtp/tls" value="<%= @zanata_smtp_tls %>" />
<% end -%>
<% if @zanata_smtp_ssl != '' -%>
<simple name="java:global/zanata/smtp/ssl" value="<%= @zanata_smtp_ssl %>" />
<% end -%>
</bindings>
<remote-naming/>