From faad5121f00010c4ec013b50635f9a8a1e7b9314 Mon Sep 17 00:00:00 2001
From: stephane <stephane@alum.mit.edu>
Date: Wed, 22 Apr 2015 09:35:25 -0700
Subject: [PATCH] Make default from address mandatory

Zanata needs to be able to send email for user registration, etc.
Make this parameter mandatory.

Change-Id: I37a2f8c9133a6ce3b098370e7df4fa1d200270c5
---
 manifests/init.pp            | 2 +-
 templates/standalone.xml.erb | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 9f9b8cf..0da8df3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -29,7 +29,7 @@ class zanata(
   $zanata_mojarra_url = 'https://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-mojarra-2.1.28.zip',
   $zanata_url = 'https://sourceforge.net/projects/zanata/files/webapp/zanata-war-3.6.0.war',
 
-  $zanata_default_from_address = '',
+  $zanata_default_from_address,
   $zanata_storage_dir = '/home/wildfly/zanata',
 
   $zanata_openid_provider_url = '',
diff --git a/templates/standalone.xml.erb b/templates/standalone.xml.erb
index b91769d..b10e898 100644
--- a/templates/standalone.xml.erb
+++ b/templates/standalone.xml.erb
@@ -423,9 +423,7 @@
                 <simple name="java:global/zanata/security/admin-users" value="admin"/>
 <% end -%>
                 <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 -%>