diff --git a/filter_plugins/generate_all_domains.py b/filter_plugins/generate_all_domains.py index 2bf25ef2..41d6b894 100644 --- a/filter_plugins/generate_all_domains.py +++ b/filter_plugins/generate_all_domains.py @@ -4,7 +4,7 @@ class FilterModule(object): def filters(self): return {'generate_all_domains': self.generate_all_domains} - def generate_all_domains(self, domains_dict, include_www=True): + def generate_all_domains(self, domains_dict, include_www:bool=True): """ Transform a dict of domains (values: str, list, dict) into a flat list, optionally add 'www.' prefixes, dedupe and sort alphabetically. diff --git a/roles/sys-ctl-hlth-webserver/tasks/01_core.yml b/roles/sys-ctl-hlth-webserver/tasks/01_core.yml index ab5240e5..9436fc24 100644 --- a/roles/sys-ctl-hlth-webserver/tasks/01_core.yml +++ b/roles/sys-ctl-hlth-webserver/tasks/01_core.yml @@ -23,7 +23,7 @@ system_service_tpl_exec_start: > {{ system_service_script_exec }} --web-protocol {{ WEB_PROTOCOL }} - --expectations '{{ applications | web_health_expectations(www_enabled=WWW_REDIRECT_ENABLED, group_names=group_names) | to_json }}' + --expectations '{{ applications | web_health_expectations(www_enabled=WWW_REDIRECT_ENABLED | bool, group_names=group_names) | to_json }}' system_service_suppress_flush: true # The healthcheck will just work after all routines passed - include_tasks: utils/run_once.yml diff --git a/tasks/stages/01_constructor.yml b/tasks/stages/01_constructor.yml index de4c3dd7..7612805e 100644 --- a/tasks/stages/01_constructor.yml +++ b/tasks/stages/01_constructor.yml @@ -90,7 +90,7 @@ items2dict(key_name='source', value_name='source'), recursive=True )) | - generate_all_domains(WWW_REDIRECT_ENABLED) + generate_all_domains(WWW_REDIRECT_ENABLED | bool) }} - name: Merge networks definitions