From 8d639a6c64df8d3c52500374d7d6717ee80b1865 Mon Sep 17 00:00:00 2001
From: Lucas Costa Beyeler <lucas.costab@outlook.com>
Date: Wed, 1 Mar 2017 17:39:29 -0300
Subject: [PATCH] Implement issue #4 and some modifications

All the service accounts are renamed to remove the gibberish created by
Zimbra.
---
 README.md                        | 2 ++
 templates/installZimbraScript.j2 | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2d5c37c..ebd2513 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,7 @@ Role Variables
 * **zmnetwork:** set the network the Zimbra server is;
 * **zmlogologin:** Inform the path for your logo (Login Screen) - don't inform and no image will be applied;
 * **zmlogoapp:** Inform the path for your logo (Application Screen) - don't inform and no image will be applied;
+* **timezone:** inform the timezone the playbook should set in your server;
 
 Dependencies
 ------------
@@ -72,6 +73,7 @@ Example Playbook
          - role: lucascbeyeler.ansible-zimbra
            hostname: warudo
            domain: hollowbastion.com
+           timezone: America/Sao_Paulo
            zmpasswd: 123change
            zmnetwork: 192.168.122.0/24
            zmlogologin: /tmp/login.png
diff --git a/templates/installZimbraScript.j2 b/templates/installZimbraScript.j2
index 46b7f8c..58879ea 100644
--- a/templates/installZimbraScript.j2
+++ b/templates/installZimbraScript.j2
@@ -55,13 +55,13 @@ SNMPTRAPHOST="{{ hostname }}.{{ domain }}"
 SPELLURL="http://{{ hostname }}.{{ domain }}:7780/aspell.php"
 STARTSERVERS="yes"
 SYSTEMMEMORY="3.8"
-TRAINSAHAM="ham.mwbaf3ds2e@{{ domain }}"
-TRAINSASPAM="spam.zp_x70awf@{{ domain }}"
+TRAINSAHAM="ham@{{ domain }}"
+TRAINSASPAM="spam@{{ domain }}"
 UIWEBAPPS="yes"
 UPGRADE="yes"
 USESPELL="yes"
 VERSIONUPDATECHECKS="TRUE"
-VIRUSQUARANTINE="virus-quarantine.ojgno7nds@{{ domain }}"
+VIRUSQUARANTINE="virus-quarantine@{{ domain }}"
 ZIMBRA_REQ_SECURITY="yes"
 ldap_bes_searcher_password="{{ zmpasswd }}"
 ldap_dit_base_dn_config="cn=zimbra"
@@ -80,7 +80,7 @@ zimbraFeatureTasksEnabled="Enabled"
 zimbraIPMode="ipv4"
 zimbraMailProxy="TRUE"
 zimbraMtaMyNetworks="127.0.0.0/8 [::1]/128 {{ zmnetwork }}"
-zimbraPrefTimeZoneId="America/Sao_Paulo"
+zimbraPrefTimeZoneId="{{ timezone }}"
 zimbraReverseProxyLookupTarget="TRUE"
 zimbraVersionCheckNotificationEmail="admin@{{ domain }}"
 zimbraVersionCheckNotificationEmailFrom="admin@{{ domain }}"