external/iiab
1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-02-13 11:42:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #278 from jvonau/squid

Browse source 
cover bad selection of install False enabled True by enduser
This commit is contained in:
georgejhunt 2017-09-21 08:01:07 -07:00 committed by GitHub
commit 0555aca5d8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
roles/network/tasks/enable_services.yml
View file

@ -57,7 +57,7 @@
- name: Enable squid service - name: Enable squid service
service: name={{ proxy }} service: name={{ proxy }}
enabled=yes enabled=yes
when: squid_enabled when: squid_enabled and squid_install
- name: Copy init script and config file - name: Copy init script and config file
template: src={{ item.src }} template: src={{ item.src }}
@ -71,13 +71,13 @@
owner: '{{ proxy_user }}' owner: '{{ proxy_user }}'
group: '{{ proxy_user }}' group: '{{ proxy_user }}'
mode: '0644' mode: '0644'
when: squid_enabled 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 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 }}
@ -92,12 +92,12 @@
- name: Enable wondershaper service - name: Enable wondershaper service
service: name=wondershaper service: name=wondershaper
enabled=yes enabled=yes
when: wondershaper_enabled 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 when: not wondershaper_enabled and wondershaper_install
# check-LAN should be iptables.yml remove later # check-LAN should be iptables.yml remove later
- name: Grab clean copy of iiab-gen-iptables - name: Grab clean copy of iiab-gen-iptables