Merge pull request #427 from sread/z-push-apache

Z-push apache config: Jessie also uses conf-available/conf-enabled

roles/mailserver/tasks/z-push.yml

@@ -44,16 +44,19 @@
 - name: Configure z-push apache alias and php settings
   copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf.d/z-push.conf
   notify: restart apache
-  when: ansible_distribution_release != 'trusty'
+  when: ansible_distribution_release != 'trusty' or ansible_distribution_release != 'jessie'
 
-- name: Create z-push apache alias and php configuration file for Ubuntu Trusty
+
+- name: Create z-push apache alias and php configuration file for Ubuntu Trusty / jessie
   copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf-available/z-push.conf
-  when: ansible_distribution_release == 'trusty'
+  when: ansible_distribution_release == 'trusty' or ansible_distribution_release == 'jessie'
+
 
-- name: Enable z-push Apache alias and PHP configuration file for Ubuntu Trusty
+- name: Enable z-push Apache alias and PHP configuration file for Ubuntu Trusty / jessie
   command: a2enconf z-push creates=/etc/apache2/conf-enabled/z-push.conf
   notify: restart apache
-  when: ansible_distribution_release == 'trusty'
+  when: ansible_distribution_release == 'trusty' or ansible_distribution_release == 'jessie'
+
 
 - name: Configure z-push logrotate
   copy: src=etc_logrotate_z-push dest=/etc/logrotate.d/z-push owner=root group=root mode=0644