浏览代码

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

Stuart Read 9 年前
父节点
当前提交
6b53da4bdc
共有 1 个文件被更改,包括 2 次插入9 次删除
  1. 2
    9
      roles/mailserver/tasks/z-push.yml

+ 2
- 9
roles/mailserver/tasks/z-push.yml 查看文件

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

正在加载...
取消
保存