From 7152d61979045a57bdcff36caec8c625142bce4c Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Mon, 5 Oct 2015 18:29:18 +0200 Subject: [PATCH] Moved Roundcube's Apache part into seperate role ispmail-webmail-apache --- ispmail.yml | 3 ++- roles/ispmail-webmail-apache/handlers/main.yml | 4 ++++ roles/ispmail-webmail-apache/tasks/main.yml | 16 ++++++++++++++++ roles/ispmail-webmail/handlers/main.yml | 4 ---- roles/ispmail-webmail/tasks/main.yml | 12 ------------ 5 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 roles/ispmail-webmail-apache/handlers/main.yml create mode 100644 roles/ispmail-webmail-apache/tasks/main.yml delete mode 100644 roles/ispmail-webmail/handlers/main.yml diff --git a/ispmail.yml b/ispmail.yml index 85398ef..bf8767d 100644 --- a/ispmail.yml +++ b/ispmail.yml @@ -9,5 +9,6 @@ - ispmail-database - ispmail-postfix - ispmail-dovecot - - { role: ispmail-webmail, when: "ispmail_populate_test_data == true" } + - ispmail-webmail + - ispmail-webmail-apache diff --git a/roles/ispmail-webmail-apache/handlers/main.yml b/roles/ispmail-webmail-apache/handlers/main.yml new file mode 100644 index 0000000..3a5124c --- /dev/null +++ b/roles/ispmail-webmail-apache/handlers/main.yml @@ -0,0 +1,4 @@ +--- +- name: restart apache + service: name=apache2 state=restarted + diff --git a/roles/ispmail-webmail-apache/tasks/main.yml b/roles/ispmail-webmail-apache/tasks/main.yml new file mode 100644 index 0000000..0f0cc09 --- /dev/null +++ b/roles/ispmail-webmail-apache/tasks/main.yml @@ -0,0 +1,16 @@ +- name: install required binary packages + apt: name={{item}} state=installed + with_items: + - apache2 + - libapache2-mod-php5 + notify: restart apache +- name: Create Apache vhost configuration for Webmail + template: src=webmail.conf.j2 dest=/etc/apache2/sites-available/webmail.conf + notify: restart apache +- name: Enable Apache vhost + command: /usr/sbin/a2ensite webmail.conf creates=/etc/apache2/sites-enabled/webmail.conf + notify: restart apache +- name: Enabling Apache SSL module + command: /usr/sbin/a2enmod ssl creates=/etc/apache2/mods-enabled/ssl.conf + notify: restart apache + diff --git a/roles/ispmail-webmail/handlers/main.yml b/roles/ispmail-webmail/handlers/main.yml deleted file mode 100644 index 3a5124c..0000000 --- a/roles/ispmail-webmail/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -- name: restart apache - service: name=apache2 state=restarted - diff --git a/roles/ispmail-webmail/tasks/main.yml b/roles/ispmail-webmail/tasks/main.yml index 65b9a16..f014326 100644 --- a/roles/ispmail-webmail/tasks/main.yml +++ b/roles/ispmail-webmail/tasks/main.yml @@ -6,18 +6,6 @@ with_items: - roundcube - roundcube-plugins - - apache2 - - libapache2-mod-php5 - notify: restart apache -- name: Create Apache vhost configuration for Webmail - template: src=webmail.conf.j2 dest=/etc/apache2/sites-available/webmail.conf - notify: restart apache -- name: Enable Apache vhost - command: /usr/sbin/a2ensite webmail.conf creates=/etc/apache2/sites-enabled/webmail.conf - notify: restart apache -- name: Enabling Apache SSL module - command: /usr/sbin/a2enmod ssl creates=/etc/apache2/mods-enabled/ssl.conf - notify: restart apache - name: Creating random des_key for Roundcube shell: pwgen 24 register: roundcube_random_des_key