diff --git a/roles/network/tasks/enable_services.yml b/roles/network/tasks/enable_services.yml index 8105688e2..8243ebf33 100644 --- a/roles/network/tasks/enable_services.yml +++ b/roles/network/tasks/enable_services.yml @@ -134,14 +134,7 @@ # enabled: no # when: (dansguardian_install or dansguardian_installed is defined) and not dansguardian_enabled -- debug: - var: squid_install -- debug: - var: squid_enabled -- debug: - var: squid_installed - -- name: Mandate 'HTTPCACHE_ON=True' in {{ iiab_env_file }} - if squid_install and squid_enabled +- name: Mandate 'HTTPCACHE_ON=True' in {{ iiab_env_file }} - if squid_install [{{ squid_install }}] and squid_enabled [{{ squid_enabled }}] lineinfile: path: "{{ iiab_env_file }}" regexp: '^HTTPCACHE_ON=*' @@ -170,13 +163,13 @@ path: "/etc/init.d/{{ proxy }}" when: squid_install and squid_enabled -- name: Disable Squid service, if not squid_enabled - if (squid_install or squid_installed is defined) and not squid_enabled +- name: Disable Squid service, if not squid_enabled - if (squid_install or squid_installed [{{ squid_installed }}] is defined) and not squid_enabled systemd: name: "{{ proxy }}" enabled: no when: (squid_install or squid_installed is defined) and not squid_enabled -- name: Revert to 'HTTPCACHE_ON=False' if not squid_enabled +- name: Revert to 'HTTPCACHE_ON=False' - if squid_install and not squid_enabled lineinfile: path: "{{ iiab_env_file }}" regexp: '^HTTPCACHE_ON=*' @@ -216,7 +209,7 @@ - gateway/iiab-internet-off -- name: Add 'squid' variable values to {{ iiab_ini_file }} +- name: Add 'squid' variable values to {{ iiab_ini_file }} - if squid_installed is defined ini_file: path: "{{ iiab_ini_file }}" # /etc/iiab/iiab.ini section: squid diff --git a/roles/network/templates/squid/squid-iiab.conf.j2 b/roles/network/templates/squid/squid-iiab.conf.j2 index c78487e02..f3d610715 100644 --- a/roles/network/templates/squid/squid-iiab.conf.j2 +++ b/roles/network/templates/squid/squid-iiab.conf.j2 @@ -4,11 +4,11 @@ ############################### # Network Interface -# {% if dansguardian_enabled %} +# ## if dansguardian_enabled ## # http_port 127.0.0.1:3130 -# {% else %} +# ## else ## http_port 0.0.0.0:3128 transparent -# {% endif %} +# ## endif ## icp_port 0