From b31110fb850bef822ad870d4ae947a51de4a1f1f Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Fri, 27 Oct 2017 14:47:01 +0200
Subject: [PATCH] postfix: merge packmail role into postfix role

---
 packmail/README.md                         | 15 ----------
 packmail/defaults/main.yml                 |  5 ----
 packmail/handlers/main.yml                 | 10 -------
 packmail/meta/main.yml                     |  6 ----
 packmail/tasks/main.yml                    | 34 ----------------------
 {packmail => postfix}/files/cn4evolix.ldif |  0
 postfix/meta/main.yml                      |  1 +
 7 files changed, 1 insertion(+), 70 deletions(-)
 delete mode 100644 packmail/README.md
 delete mode 100644 packmail/defaults/main.yml
 delete mode 100644 packmail/handlers/main.yml
 delete mode 100644 packmail/meta/main.yml
 delete mode 100644 packmail/tasks/main.yml
 rename {packmail => postfix}/files/cn4evolix.ldif (100%)

diff --git a/packmail/README.md b/packmail/README.md
deleted file mode 100644
index f4cbbee3..00000000
--- a/packmail/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# packmail
-
-Install the mail pack, with Postfix/Dovecot/LDAP/evoadmin-mail.
-
-## Tasks
-
-See `tasks/main.yml`.
-
-## Available variables
-
-Main variables are :
-
-* `packmail_enable_evoadmin_vhost` : enable VirtualHost for evoadmin (web interface to create mail accounts)
-
-The full list of variables (with default values) can be found in `defaults/main.yml`.
diff --git a/packmail/defaults/main.yml b/packmail/defaults/main.yml
deleted file mode 100644
index fc1d2a9f..00000000
--- a/packmail/defaults/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-# defaults file for packmail
-general_alert_email: "root@localhost"
-
-packmail_enable_evoadmin_vhost: True
diff --git a/packmail/handlers/main.yml b/packmail/handlers/main.yml
deleted file mode 100644
index 92228e1c..00000000
--- a/packmail/handlers/main.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: restart postfix
-  service:
-    name: postfix
-    state: restarted
-
-- name: restart dovecot
-  service:
-    name: dovecot
-    state: restarted
diff --git a/packmail/meta/main.yml b/packmail/meta/main.yml
deleted file mode 100644
index c98ef251..00000000
--- a/packmail/meta/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-dependencies:
-  - { role: ldap, ldap_schema: 'cn4evolix.ldif' }
-  - { role: postfix, postfix_packmail: True, postfix_force_main_cf: True }
-  - { role: apache }
-  - { role: php, php_apache_enable: True }
diff --git a/packmail/tasks/main.yml b/packmail/tasks/main.yml
deleted file mode 100644
index 36d23365..00000000
--- a/packmail/tasks/main.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- fail:
-    msg: only compatible with Debian >= 9
-  when:
-  - ansible_distribution != "Debian" or ansible_distribution_major_version | version_compare('9', '<')
-
-- name: Additional packages are installed
-  apt:
-    name: '{{ item }}'
-    state: present
-  with_items:
-  - libapache2-mod-security2
-  - modsecurity-crs
-  - apg
-
-- name: Additional modules are enabled
-  apache2_module:
-    name: '{{ item }}'
-    state: present
-  with_items:
-  - ssl
-  - include
-  - negotiation
-  - alias
-
-- name: Install Evoadmin
-  include_role:
-    name: webapps/evoadmin-mail
-  vars:
-    evoadminmail_enable_vhost: '{{ packmail_enable_evoadmin_vhost }}'
-
-- name: Install Roundcube
-  include_role:
-    name: webapps/roundcube
diff --git a/packmail/files/cn4evolix.ldif b/postfix/files/cn4evolix.ldif
similarity index 100%
rename from packmail/files/cn4evolix.ldif
rename to postfix/files/cn4evolix.ldif
diff --git a/postfix/meta/main.yml b/postfix/meta/main.yml
index d9c76f96..3c7b219a 100644
--- a/postfix/meta/main.yml
+++ b/postfix/meta/main.yml
@@ -14,6 +14,7 @@ galaxy_info:
     - jessie
 
 dependencies:
+  - { role: ldap, ldap_schema: 'cn4evolix.ldif', when: postfix_packmail == True }
   - { role: spamassasin, when: postfix_packmail == True }
   - { role: clamav, when: postfix_packmail == True }
   - { role: opendkim, when: postfix_packmail == True }