소스 검색

Remove conditionnal inclusion of handlers (it doesn't work)

Emmanuel Bouthenot 8 년 전
부모
커밋
fcdda0f1d7
4개의 변경된 파일0개의 추가작업 그리고 13개의 파일을 삭제
  1. 0 4
      roles/common/handlers/main.yml
  2. 0 2
      roles/ftpserver/handlers/main.yml
  3. 0 3
      roles/monitoring/handlers/main.yml
  4. 0 4
      roles/webserver/handlers/main.yml

+ 0 - 4
roles/common/handlers/main.yml

@@ -1,11 +1,7 @@
 - include: base.yml
 - include: firewall.yml
-  when: with_firewall
 - include: security.yml
 - include: smtp.yml
-  when: with_postfix
 - include: dkim.yml
-  when: with_opendkim
 - include: ssh.yml
 - include: smartd.yml
-  when: with_smartd

+ 0 - 2
roles/ftpserver/handlers/main.yml

@@ -1,4 +1,2 @@
 - include: 'common.yml'
-  when: with_ftp
 - include: 'pure-ftpd.yml'
-  when: with_ftp

+ 0 - 3
roles/monitoring/handlers/main.yml

@@ -1,6 +1,3 @@
 - include: munin.yml
-  when: with_munin or with_munin_node
 - include: mon.yml
-  when: with_mon
 - include: zabbix.yml
-  when: with_zabbix_agent

+ 0 - 4
roles/webserver/handlers/main.yml

@@ -1,8 +1,4 @@
 - include: apache2.yml
-  when: with_apache2
 - include: nginx.yml
-  when: with_nginx
 - include: fpm.yml
-  when: with_fpm
 - include: php.yml
-  when: with_php