1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 19:52:06 +00:00

cleaner Ansible output

This commit is contained in:
A Holt 2017-10-27 12:22:06 -04:00 committed by GitHub
parent 7431fe572e
commit 37148b3cf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -39,12 +39,12 @@
enabled=no enabled=no
when: not named_enabled when: not named_enabled
- name: Enable dansguardian - name: Enable DansGuardian
service: name=dansguardian service: name=dansguardian
enabled=yes enabled=yes
when: dansguardian_enabled and dansguardian_install when: dansguardian_enabled and dansguardian_install
- name: Disable dansguardian - name: Disable DansGuardian
service: name=dansguardian service: name=dansguardian
enabled=no enabled=no
when: not dansguardian_enabled and dansguardian_install when: not dansguardian_enabled and dansguardian_install
@ -54,7 +54,7 @@
creates=/etc/sysconfig/xs_httpcache_on creates=/etc/sysconfig/xs_httpcache_on
when: squid_enabled when: squid_enabled
- name: Enable squid service - name: Enable Squid service
service: name={{ proxy }} service: name={{ proxy }}
enabled=yes enabled=yes
when: squid_enabled and squid_install when: squid_enabled and squid_install
@ -73,13 +73,13 @@
mode: '0644' mode: '0644'
when: squid_enabled and squid_install when: squid_enabled and squid_install
- name: point to Squid config file from startup file - name: Point to Squid config file from startup file
lineinfile: regexp='^CONFIG' lineinfile: regexp='^CONFIG'
line='CONFIG=/etc/{{ proxy }}/squid-iiab.conf' line='CONFIG=/etc/{{ proxy }}/squid-iiab.conf'
dest=/etc/init.d/{{ proxy }} dest=/etc/init.d/{{ proxy }}
when: squid_enabled and squid_install and is_debuntu when: squid_enabled and squid_install and is_debuntu
- name: Disable squid service - name: Disable Squid service
service: name={{ proxy }} service: name={{ proxy }}
enabled=no enabled=no
when: not squid_enabled and squid_install when: not squid_enabled and squid_install
@ -89,12 +89,12 @@
state=absent state=absent
when: not squid_enabled when: not squid_enabled
- name: Enable wondershaper service - name: Enable Wondershaper service
service: name=wondershaper service: name=wondershaper
enabled=yes enabled=yes
when: wondershaper_enabled and wondershaper_install when: wondershaper_enabled and wondershaper_install
- name: Disable wondershaper service - name: Disable Wondershaper service
service: name=wondershaper service: name=wondershaper
enabled=no enabled=no
when: not wondershaper_enabled and wondershaper_install when: not wondershaper_enabled and wondershaper_install
@ -122,7 +122,7 @@
- option: enabled - option: enabled
value: "{{ squid_enabled }}" value: "{{ squid_enabled }}"
- name: Add dansguardian to service list - name: Add DansGuardian to service list
ini_file: dest='{{ service_filelist }}' ini_file: dest='{{ service_filelist }}'
section=dansguardian section=dansguardian
option='{{ item.option }}' option='{{ item.option }}'