Browse Source

Add jessie to special-casing for modern apache conf.d handling.

Stuart Read 8 years ago
parent
commit
e444efa2b4
1 changed files with 8 additions and 5 deletions
  1. 8
    5
      roles/mailserver/tasks/z-push.yml

+ 8
- 5
roles/mailserver/tasks/z-push.yml View File

44
 - name: Configure z-push apache alias and php settings
44
 - name: Configure z-push apache alias and php settings
45
   copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf.d/z-push.conf
45
   copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf.d/z-push.conf
46
   notify: restart apache
46
   notify: restart apache
47
-  when: ansible_distribution_release != 'trusty'
47
+  when: ansible_distribution_release != 'trusty' or ansible_distribution_release != 'jessie'
48
 
48
 
49
-- name: Create z-push apache alias and php configuration file for Ubuntu Trusty
49
+
50
+- name: Create z-push apache alias and php configuration file for Ubuntu Trusty / jessie
50
   copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf-available/z-push.conf
51
   copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf-available/z-push.conf
51
-  when: ansible_distribution_release == 'trusty'
52
+  when: ansible_distribution_release == 'trusty' or ansible_distribution_release == 'jessie'
53
+
52
 
54
 
53
-- name: Enable z-push Apache alias and PHP configuration file for Ubuntu Trusty
55
+- name: Enable z-push Apache alias and PHP configuration file for Ubuntu Trusty / jessie
54
   command: a2enconf z-push creates=/etc/apache2/conf-enabled/z-push.conf
56
   command: a2enconf z-push creates=/etc/apache2/conf-enabled/z-push.conf
55
   notify: restart apache
57
   notify: restart apache
56
-  when: ansible_distribution_release == 'trusty'
58
+  when: ansible_distribution_release == 'trusty' or ansible_distribution_release == 'jessie'
59
+
57
 
60
 
58
 - name: Configure z-push logrotate
61
 - name: Configure z-push logrotate
59
   copy: src=etc_logrotate_z-push dest=/etc/logrotate.d/z-push owner=root group=root mode=0644
62
   copy: src=etc_logrotate_z-push dest=/etc/logrotate.d/z-push owner=root group=root mode=0644

Loading…
Cancel
Save