Merge pull request #24 from UdelaRInterior/agregarCaseUbuntu20

Including installer for Ubuntu 20

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [lucascbeyeler]

.gitignore

@@ -1 +1,2 @@
 OLD
+.idea

README.md

@@ -1,22 +1,22 @@
 Zimbra
 =========
 
-Ansible role to install and configure Zimbra Collaboration Open Source Edition
+Non-Official ansible role to install and configure Zimbra Collaboration Open Source Edition on Red Hat, CentOS and Ubuntu Server.
 
 [![Build Status](https://travis-ci.org/lucascbeyeler/zimbra.svg?branch=master)](https://travis-ci.org/lucascbeyeler/zimbra)
-[![Zimbra Version](https://img.shields.io/badge/Zimbra-8.7.11-blue.svg)](https://www.zimbra.com/downloads/zimbra-collaboration-open-source/)
+[![Zimbra Version](https://img.shields.io/badge/Zimbra-8.8.15-blue.svg)](https://www.zimbra.com/downloads/zimbra-collaboration-open-source/)
 ![Linux Distro](https://img.shields.io/badge/platform-CentOS%20%7C%20Red%20Hat%20%7C%20Ubuntu-blue.svg)
 ![Branch](https://img.shields.io/badge/Branch-Master-green.svg)
-[![Ansible Version](https://img.shields.io/badge/Ansible-2.3.1.0-green.svg)](https://www.ansible.com/)
+[![Ansible Version](https://img.shields.io/badge/Ansible-2.9.6-green.svg)](https://www.ansible.com/)
 
 Requirements
 ------------
 
-* [Ansible](https://github.com/ansible/ansible) 2.3.1.0 or superior.
+* [Ansible](https://github.com/ansible/ansible) 2.9.6 or high.
 
 Install
 --------------
-ansible-zimbra is already in Ansible Galaxy, so the only thing you need to install this script in your machine is just use ansible-galaxy command:
+Zimbra is already in Ansible Galaxy, so the only thing you need to install this script in your machine is just use ansible-galaxy command:
 
 ```
 ansible-galaxy install lucascbeyeler.zimbra
@@ -53,6 +53,7 @@ Role Variables
 * **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;
+* **zimbra_version:** Inform which version of Zimbra you want to install. Default: 8.8.15
 
 Service Variables - Inform "y" or "n"
 --------------
@@ -67,8 +68,9 @@ Service Variables - Inform "y" or "n"
 * **zimbra_spell:**  Enable Zimbra Spell Check - default: **y**
 * **zimbra_memcached:**  Enable Zimbra Cache Service (Memcached) - default: **y**
 * **zimbra_proxy:**  Enable Zimbra Proxy Service - default: **y**
-* **zimbra_chat:**  Enable Zimbra Chat **BETA** - default: **n**
+* **zimbra_chat:**  Enable Zimbra Chat - default: **n**
-* **zimbra_drive:**  Enable Zimbra ownCloud Drive **BETA** - default: **n**
+* **zimbra_drive:**  Enable Zimbra ownCloud Drive - default: **n**
+* **zimbra_imapd:** Enable Zimbra IMAPD Solo Service **BETA**  - default: **n**
 * **zimbra_policyd:**  Enable Zimbra PolicyD Service - default: **n**
 
 Dependencies
@@ -83,9 +85,9 @@ Example Playbook
       become: yes
       become_method: sudo
       roles:
-         - role: lucascbeyeler.ansible-zimbra
+         - role: lucascbeyeler.zimbra
-           hostname: warudo
+           hostname: localhost
-           domain: hollowbastion.com
+           domain: localdomain
            timezone: America/Sao_Paulo
            zmpasswd: 123change
            zmnetwork: 192.168.122.0/24

defaults/main.yml

@@ -9,3 +9,39 @@ ubuntu:
 centos:
   - pyzor
   - perl-Razor-Agent
+
+#
+# Products to be installed
+################################################################################
+zimbra_ldap: y
+zimbra_logger: y
+zimbra_mta: y
+zimbra_dnscache: n
+zimbra_snmp: n
+zimbra_store: y
+zimbra_apache: y
+zimbra_spell: y
+zimbra_memcached: y
+zimbra_proxy: y
+zimbra_chat: n
+zimbra_drive: n
+zimbra_imapd: n
+zimbra_policyd: n
+
+#
+# Zimbra configuration
+################################################################################
+
+hostname: "localhost"
+domain: "localdomain"
+zmpasswd: "!23Change"
+zmnetwork: "192.168.200.0/8"
+timezone: UTC
+#hosts_lines:
+#  - "198.162.1.3 {{ hostname }}.{{ domain }} {{ hostname }}" 
+
+#
+# Zimbra configuration
+################################################################################
+zimbra_version: 8.8.15
+

files/sauser.cf

@@ -6,6 +6,14 @@ pyzor_timeout 20
 # Razor's Config - Change only if you know what are you doing
 use_razor2 1
 
+# Enabling Bayesian mail filtering
+use_bayes 1
+score BAYES_90 4.300
+score BAYES_80 3.500
+score BAYES_60 3.000
+score BAYES_50 2.500
+score BAYES_00 -0.500
+
 #SpamAssassin's Scores - Change THIS file and not salocal.cf
 
 score ALL_TRUSTED -4.000
@@ -61,3 +69,4 @@ score T_URL_SHORTENER 0.400
 score BAD_ENC_HEADER 0.400
 score T_UNKNOWN_ORIGIN 0.700
 score RP_MATCHES_RCVD -0.000
+score 

meta/main.yml

@@ -3,19 +3,19 @@ galaxy_info:
   description: Ansible role to install and configure Zimbra Collaboration Open Source Edition
   company: Beyeler
   license: GPLv3
-  min_ansible_version: 2.3
+  min_ansible_version: 2.9.6
   github_branch: master
   platforms:
   - name: Ubuntu
     versions:
     - trusty
     - xenial
+    - bionic
   - name: EL
     versions:
     - 6
     - 7
+    - 8
   galaxy_tags:
     - zimbra
     - community
-dependencies:
-  - { role: lucascbeyeler.baseline }

tasks/configure/mta.yml

@@ -17,6 +17,27 @@
     owner: root
     group: root
     mode: 0440
+    
+- name: Enabling SpamAssassin Auto Update
+  command: ./zmlocalconfig -e antispam_enable_rule_updates=true
+  args:
+    chdir: /opt/zimbra/bin/
+  become: true
+  become_user: zimbra
+    
+- name: Enabling Amavis to restart when the rules are update
+  command: ./zmlocalconfig -e antispam_enable_restarts=true
+  args:
+    chdir: /opt/zimbra/bin/
+  become: true
+  become_user: zimbra
+
+- name: Enabling SpamAssassin rule compilation
+  command: ./zmlocalconfig -e antispam_enable_rule_compilation=true
+  args:
+    chdir: /opt/zimbra/bin/
+  become: true
+  become_user: zimbra
 
 #
 # Configuring Pyzor

tasks/install/vars.yml

@@ -1,22 +0,0 @@
----
-#
-# Setting variables
-################################################################################
-- name: Loading the address to the most recent release of Zimbra OSE (8.7.11)
-  set_fact: zmurl=https://files.zimbra.com/downloads/8.7.11_GA/
-
-- name: Check if your distro is Ubuntu Server 16.04 LTS
-  set_fact: zmpkg=zcs-8.7.11_GA_1854.UBUNTU16_64.20170531151956
-  when: ansible_distribution_major_version|int >= 16
-
-- name: Check if your distro is Ubuntu Server 14.04 LTS
-  set_fact: zmpkg=zcs-8.7.11_GA_1854.UBUNTU14_64.20170531151956
-  when: ansible_distribution_major_version|int >= 14 and ansible_distribution_major_version|int <= 15
-
-- name: Check if your distro is Red Hat Enterprise Linux or CentOS (Major 6)
-  set_fact: zmpkg=zcs-8.7.11_GA_1854.RHEL6_64.20170531151956
-  when: ansible_distribution_major_version == "6"
-
-- name: Check if your distro is Red Hat Enterprise Linux or CentOS (Major 7)
-  set_fact: zmpkg=zcs-8.7.11_GA_1854.RHEL7_64.20170531151956
-  when: ansible_distribution_major_version == "7"

tasks/install/zimbra.yml

@@ -2,6 +2,15 @@
 #
 # Download and install Zimbra OSE
 ################################################################################
+
+- name: Update /etc/hosts
+  lineinfile:
+    path: /etc/hosts 
+    line: "{{ item }}" 
+    state: present
+  with_items: "{{ hosts_lines }}"
+  when: hosts_lines is defined
+  
 - name: Download and unpacking Zimbra OSE
   unarchive:
     validate_certs: no

tasks/main.yml

@@ -10,38 +10,39 @@
 #
 # Installation process
 ################################################################################
-- include: 'install/vars.yml'
+- import_tasks: 'vars/{{zimbra_version}}.yml'
   when: getent_passwd.rc == 2
-- include: 'install/dependencies.yml'
+- import_tasks: 'install/dependencies.yml'
   when: getent_passwd.rc == 2
-- include: 'install/zimbra.yml'
+- import_tasks: 'install/zimbra.yml'
   when: getent_passwd.rc == 2
-- include: 'install/policyd.yml'
+- import_tasks: 'install/policyd.yml'
   when: zimbra_policyd == 'y'
 
 #
 # Configuration process
 ################################################################################
-- include: 'configure/proxy.yml'
+- import_tasks: 'configure/proxy.yml'
   when: zimbra_proxy == 'y'
-- include: 'configure/mailbox.yml'
+- import_tasks: 'configure/mailbox.yml'
   when: zimbra_store == 'y'
-- include: 'configure/mta.yml'
+- import_tasks: 'configure/mta.yml'
   when: zimbra_mta == 'y'
 
 #
 # Extras configuration process
 ################################################################################
-- include: 'extras/modify-logo.yml'
+- import_tasks: 'extras/modify-logo.yml'
   when: zmlogologin is defined and zmlogoapp is defined
 
 #
 # Restarting Zimbra
 ################################################################################
 - name: 'Reloading Zimbra OSE Services'
-  command: ./zmcontrol restart
+  shell: source /opt/zimbra/.bashrc && ./zmcontrol restart
   args:
+    executable: /bin/bash
     chdir: '/opt/zimbra/bin/'
   become: yes
   become_user: zimbra
-  ignore_errors: true
+  retries: 3

tasks/vars/8.8.15.yml

@@ -0,0 +1,34 @@
+---
+#
+# Setting variables
+################################################################################
+- name: Loading the address to the most recent release of Zimbra OSE (8.8.15)
+  set_fact: zmurl=https://files.zimbra.com/downloads/8.8.15_GA/
+
+- name: Check if your distro is Ubuntu Server 16.04 LTS
+  set_fact: zmpkg=zcs-8.8.15_GA_3869.UBUNTU16_64.20190918004220
+  when: ansible_distribution_major_version|int >= 16 and ansible_distribution_major_version|int <= 17
+
+- name: Check if your distro is Ubuntu Server 18.04 LTS
+  set_fact: zmpkg=zcs-8.8.15_GA_3869.UBUNTU18_64.20190918004220
+  when: ansible_distribution_major_version|int >= 18 and ansible_distribution_major_version|int <= 19
+
+- name: Check if your distro is Ubuntu Server 20.04 LTS
+  set_fact: zmpkg=zcs-8.8.15_GA_4179.UBUNTU20_64.20211118033954
+  when: ansible_distribution_major_version|int >= 20
+
+- name: Check if your distro is Ubuntu Server 14.04 LTS
+  set_fact: zmpkg=zcs-8.8.15_GA_3869.UBUNTU14_64.20190918004220
+  when: ansible_distribution_major_version|int >= 14 and ansible_distribution_major_version|int <= 15
+
+- name: Check if your distro is Red Hat Enterprise Linux or CentOS (Major 6)
+  set_fact: zmpkg=zcs-8.8.15_GA_3869.RHEL6_64.20190918004220
+  when: ansible_distribution_major_version == "6"
+
+- name: Check if your distro is Red Hat Enterprise Linux or CentOS (Major 7)
+  set_fact: zmpkg=zcs-8.8.15_GA_3869.RHEL7_64.20190918004220
+  when: ansible_distribution_major_version == "7"
+
+- name: Check if your distro is Red Hat Enterprise Linux or CentOS (Major 8)
+  set_fact: zmpkg=zcs-8.8.15_GA_3953.RHEL8_64.20200629025823
+  when: ansible_distribution_major_version == "8"

templates/installZimbra-keystrokes

@@ -12,4 +12,5 @@ y
 {{ zimbra_proxy }}
 {{ zimbra_chat }}
 {{ zimbra_drive }}
+{{ zimbra_imapd }}
 y

templates/installZimbraScript.j2

@@ -70,7 +70,7 @@ mailboxd_directory="/opt/zimbra/mailboxd"
 mailboxd_keystore="/opt/zimbra/mailboxd/etc/keystore"
 mailboxd_keystore_password="{{ zmpasswd }}"
 mailboxd_server="jetty"
-mailboxd_truststore="/opt/zimbra/common/lib/jvm/java/jre/lib/security/cacerts"
+mailboxd_truststore="/opt/zimbra/common/etc/java/cacerts"
 mailboxd_truststore_password="changeit"
 postfix_mail_owner="postfix"
 postfix_setgid_group="postdrop"

vars/main.yml

@@ -1,27 +0,0 @@
----
-#
-# Products to be installed
-################################################################################
-zimbra_ldap: y
-zimbra_logger: y
-zimbra_mta: y
-zimbra_dnscache: n
-zimbra_snmp: n
-zimbra_store: y
-zimbra_apache: y
-zimbra_spell: y
-zimbra_memcached: y
-zimbra_proxy: y
-zimbra_chat: n
-zimbra_drive: n
-zimbra_policyd: n
-
-#
-# Zimbra configuration
-################################################################################
-
-hostname: "localhost"
-domain: "localdomain"
-zmpasswd: "!23Change"
-zmnetwork: "192.168.200.0/8"
-timezone: UTC