From 653ca81501f34bb18a9e083949ccab1a87f8acbc Mon Sep 17 00:00:00 2001 From: stephane Date: Thu, 26 Mar 2015 12:20:56 -0700 Subject: [PATCH] Add SMTP configuration options for Zanata Zanata defaults to using a local SMTP server, but you can configure it to do otherwise. Pass the values to the template for easy setup. Change-Id: Ia0b1231c9bd1df50082f4e0bcf954aee29d1615a --- manifests/init.pp | 7 +++++++ templates/standalone.xml.erb | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/manifests/init.pp b/manifests/init.pp index b5ae9d0..84f6eb9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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) %>') diff --git a/templates/standalone.xml.erb b/templates/standalone.xml.erb index bf9b3aa..b91769d 100644 --- a/templates/standalone.xml.erb +++ b/templates/standalone.xml.erb @@ -425,6 +425,24 @@ <% if @zanata_default_from_address != '' -%> +<% end -%> +<% if @zanata_smtp_host != '' -%> + +<% end -%> +<% if @zanata_smtp_port != '' -%> + +<% end -%> +<% if @zanata_smtp_username != '' -%> + +<% end -%> +<% if @zanata_smtp_password != '' -%> + +<% end -%> +<% if @zanata_smtp_tls != '' -%> + +<% end -%> +<% if @zanata_smtp_ssl != '' -%> + <% end -%>