mirror of
https://github.com/iiab/iiab.git
synced 2025-03-09 15:40:17 +00:00
squid-iiab.conf.j2: Comment out 'if dansguardian_enabled' etc
This commit is contained in:
parent
7c6494b31a
commit
093f8532cc
2 changed files with 7 additions and 14 deletions
|
@ -134,14 +134,7 @@
|
||||||
# enabled: no
|
# enabled: no
|
||||||
# when: (dansguardian_install or dansguardian_installed is defined) and not dansguardian_enabled
|
# when: (dansguardian_install or dansguardian_installed is defined) and not dansguardian_enabled
|
||||||
|
|
||||||
- debug:
|
- name: Mandate 'HTTPCACHE_ON=True' in {{ iiab_env_file }} - if squid_install [{{ squid_install }}] and squid_enabled [{{ squid_enabled }}]
|
||||||
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
|
|
||||||
lineinfile:
|
lineinfile:
|
||||||
path: "{{ iiab_env_file }}"
|
path: "{{ iiab_env_file }}"
|
||||||
regexp: '^HTTPCACHE_ON=*'
|
regexp: '^HTTPCACHE_ON=*'
|
||||||
|
@ -170,13 +163,13 @@
|
||||||
path: "/etc/init.d/{{ proxy }}"
|
path: "/etc/init.d/{{ proxy }}"
|
||||||
when: squid_install and squid_enabled
|
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:
|
systemd:
|
||||||
name: "{{ proxy }}"
|
name: "{{ proxy }}"
|
||||||
enabled: no
|
enabled: no
|
||||||
when: (squid_install or squid_installed is defined) and not squid_enabled
|
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:
|
lineinfile:
|
||||||
path: "{{ iiab_env_file }}"
|
path: "{{ iiab_env_file }}"
|
||||||
regexp: '^HTTPCACHE_ON=*'
|
regexp: '^HTTPCACHE_ON=*'
|
||||||
|
@ -216,7 +209,7 @@
|
||||||
- gateway/iiab-internet-off
|
- 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:
|
ini_file:
|
||||||
path: "{{ iiab_ini_file }}" # /etc/iiab/iiab.ini
|
path: "{{ iiab_ini_file }}" # /etc/iiab/iiab.ini
|
||||||
section: squid
|
section: squid
|
||||||
|
|
|
@ -4,11 +4,11 @@
|
||||||
###############################
|
###############################
|
||||||
# Network Interface
|
# Network Interface
|
||||||
|
|
||||||
# {% if dansguardian_enabled %}
|
# ## if dansguardian_enabled ##
|
||||||
# http_port 127.0.0.1:3130
|
# http_port 127.0.0.1:3130
|
||||||
# {% else %}
|
# ## else ##
|
||||||
http_port 0.0.0.0:3128 transparent
|
http_port 0.0.0.0:3128 transparent
|
||||||
# {% endif %}
|
# ## endif ##
|
||||||
|
|
||||||
icp_port 0
|
icp_port 0
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue