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

WIP: iiab.ini vars set in 3 places? For Squid, DansGuardian, Wondershaper

Browse source
This commit is contained in:
root 2021-04-29 16:08:31 -04:00
parent a07a684d13
commit 670746fe88
2 changed files with 42 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
roles/network/tasks/computed_services.yml
View file

@ -57,12 +57,18 @@
option: "{{ item.option }}" option: "{{ item.option }}"
value: "{{ item.value | string }}" value: "{{ item.value | string }}"
with_items: with_items:
- option: dansguardian_enabled #- option: dansguardian_install
value: "{{ dansguardian_enabled }}" # value: "{{ dansguardian_install }}"
- option: squid_enabled #- option: dansguardian_enabled
value: "{{ squid_enabled }}" # value: "{{ dansguardian_enabled }}"
- option: wondershaper_enabled #- option: squid_install
value: "{{ wondershaper_enabled }}" # value: "{{ squid_install }}"
#- option: squid_enabled
# value: "{{ squid_enabled }}"
#- option: wondershaper_install
# value: "{{ wondershaper_install }}"
#- option: wondershaper_enabled
# value: "{{ wondershaper_enabled }}"
- option: iiab_network_mode_applied - option: iiab_network_mode_applied
value: "{{ iiab_network_mode }}" value: "{{ iiab_network_mode }}"
- option: dhcpd_enabled - option: dhcpd_enabled

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

@ -216,6 +216,7 @@
- gateway/iiab-internet-on - gateway/iiab-internet-on
- 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 }}
ini_file: ini_file:
path: "{{ iiab_ini_file }}" path: "{{ iiab_ini_file }}"
@ -223,7 +224,9 @@
option: "{{ item.option }}" option: "{{ item.option }}"
value: "{{ item.value | string }}" value: "{{ item.value | string }}"
with_items: with_items:
- option: enabled - option: squid_install
value: "{{ squid_install }}"
- option: squid_enabled
value: "{{ squid_enabled }}" value: "{{ squid_enabled }}"
- name: Add 'dansguardian' variable values to {{ iiab_ini_file }} - name: Add 'dansguardian' variable values to {{ iiab_ini_file }}
@ -233,7 +236,9 @@
option: "{{ item.option }}" option: "{{ item.option }}"
value: "{{ item.value | string }}" value: "{{ item.value | string }}"
with_items: with_items:
- option: enabled - option: dansguardian_install
value: "{{ dansguardian_install }}"
- option: dansguardian_enabled
value: "{{ dansguardian_enabled }}" value: "{{ dansguardian_enabled }}"
- name: Add 'wondershaper' variable values to {{ iiab_ini_file }} - name: Add 'wondershaper' variable values to {{ iiab_ini_file }}
@ -243,5 +248,7 @@
option: "{{ item.option }}" option: "{{ item.option }}"
value: "{{ item.value | string }}" value: "{{ item.value | string }}"
with_items: with_items:
- option: enabled - option: wondershaper_install
value: "{{ wondershaper_install }}"
- option: wondershaper_enabled
value: "{{ wondershaper_enabled }}" value: "{{ wondershaper_enabled }}"