Merge pull request #278 from jvonau/squid

cover bad selection of install False enabled True by enduser

roles/network/tasks/enable_services.yml

@@ -57,7 +57,7 @@
 - name: Enable squid service
   service: name={{ proxy }}
            enabled=yes
-  when: squid_enabled
+  when: squid_enabled and squid_install
 
 - name: Copy init script and config file
   template: src={{ item.src }}
@@ -71,13 +71,13 @@
       owner: '{{ proxy_user }}'
       group: '{{ proxy_user }}'
       mode: '0644'
-  when: squid_enabled
+  when: squid_enabled and squid_install
 
 - name: point to Squid config file from startup file
   lineinfile: regexp='^CONFIG'
               line='CONFIG=/etc/{{ proxy }}/squid-iiab.conf'
               dest=/etc/init.d/{{ proxy }}
-  when: squid_enabled and is_debuntu
+  when: squid_enabled and squid_install and is_debuntu
 
 - name: Disable squid service
   service: name={{ proxy }}
@@ -92,12 +92,12 @@
 - name: Enable wondershaper service
   service: name=wondershaper
            enabled=yes
-  when: wondershaper_enabled
+  when: wondershaper_enabled and wondershaper_install
 
 - name: Disable wondershaper service
   service: name=wondershaper
            enabled=no
-  when: not wondershaper_enabled
+  when: not wondershaper_enabled and wondershaper_install
 
 # check-LAN should be iptables.yml remove later 
 - name: Grab clean copy of iiab-gen-iptables