Browse Source

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

This reverts commit 6b53da4bdc.

Using a different approach to maintain wheezy compatibility
Stuart Read 9 years ago
parent
commit
22ef6be96e
1 changed files with 9 additions and 2 deletions
  1. 9
    2
      roles/mailserver/tasks/z-push.yml

+ 9
- 2
roles/mailserver/tasks/z-push.yml View File

41
 - name: Copy z-push's config.php into place
41
 - name: Copy z-push's config.php into place
42
   template: src=usr_share_z-push_config.php.j2 dest=/usr/share/z-push/config.php
42
   template: src=usr_share_z-push_config.php.j2 dest=/usr/share/z-push/config.php
43
 
43
 
44
-- name: Create z-push Apache alias and PHP configuration file
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
46
+  notify: restart apache
47
+  when: ansible_distribution_release != 'trusty'
48
+
49
+- name: Create z-push apache alias and php configuration file for Ubuntu Trusty
45
   copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf-available/z-push.conf
50
   copy: src=etc_apache2_conf.d_z-push.conf dest=/etc/apache2/conf-available/z-push.conf
51
+  when: ansible_distribution_release == 'trusty'
46
 
52
 
47
-- name: Enable z-push Apache alias and PHP configuration file
53
+- name: Enable z-push Apache alias and PHP configuration file for Ubuntu Trusty
48
   command: a2enconf z-push creates=/etc/apache2/conf-enabled/z-push.conf
54
   command: a2enconf z-push creates=/etc/apache2/conf-enabled/z-push.conf
49
   notify: restart apache
55
   notify: restart apache
56
+  when: ansible_distribution_release == 'trusty'
50
 
57
 
51
 - name: Configure z-push logrotate
58
 - name: Configure z-push logrotate
52
   copy: src=etc_logrotate_z-push dest=/etc/logrotate.d/z-push owner=root group=root mode=0644
59
   copy: src=etc_logrotate_z-push dest=/etc/logrotate.d/z-push owner=root group=root mode=0644

Loading…
Cancel
Save