From: Aleš Mrázek Date: Thu, 3 Aug 2023 13:57:34 +0000 (+0200) Subject: datamodel: unused templates deleted X-Git-Tag: v6.0.2~20^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=073af6bfbb5053669cefc3d9b2f3e6606320e095;p=thirdparty%2Fknot-resolver.git datamodel: unused templates deleted --- diff --git a/manager/knot_resolver_manager/datamodel/templates/forward_zones.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/forward_zones.lua.j2 deleted file mode 100644 index 26e0a9e83..000000000 --- a/manager/knot_resolver_manager/datamodel/templates/forward_zones.lua.j2 +++ /dev/null @@ -1,72 +0,0 @@ -{% from 'macros/policy_macros.lua.j2' import policy_flags, policy_add, policy_suffix, policy_todname, policy_forward, policy_tls_forward %} -{% from 'macros/view_macros.lua.j2' import view_tsig, view_addr %} - -{% if cfg.forward_zones %} -{% for zone in cfg.forward_zones %} --- forward-zone: {{ zone.subtree }} -{% if zone.views -%} -{# views set for forward-zone #} -{% for view_id in zone.views -%} -{%- set view = cfg.views[view_id] -%} - -{# merge options from view and forward-zone #} -{%- set options = none -%} -{% if zone.options and view.options -%} -{% set options = zone.options|list + view.options|list %} -{% elif zone.options %} -{% set options = zone.options|list %} -{% elif view.options %} -{% set options = view.options|list %} -{%- endif %} - -{# view tsig #} -{% if view.tsig %} -{% for tsig in view.tsig %} - -{%- if options -%} -{{ view_tsig(tsig|string, policy_suffix(policy_flags(options|list), policy_todname(zone.subtree|string))) }} -{%- endif %} - -{% if zone.tls -%} -{{ view_tsig(tsig|string, policy_suffix(policy_tls_forward(zone.servers|list), policy_todname(zone.subtree|string))) }} -{% else %} -{{ view_tsig(tsig|string, policy_suffix(policy_forward(zone.servers|list), policy_todname(zone.subtree|string))) }} -{%- endif %} - -{% endfor %} -{% endif %} - -{# view addr #} -{% if view.subnets %} -{% for addr in view.subnets %} - -{%- if options -%} -{{ view_addr(addr|string, policy_suffix(policy_flags(options|list), policy_todname(zone.subtree|string))) }} -{%- endif %} - -{% if zone.tls -%} -{{ view_addr(addr|string, policy_suffix(policy_tls_forward(zone.servers|list), policy_todname(zone.subtree|string))) }} -{% else %} -{{ view_addr(addr|string, policy_suffix(policy_forward(zone.servers|list), policy_todname(zone.subtree|string))) }} -{%- endif %} - -{% endfor %} -{% endif %} - -{% endfor %} -{% else %} -{# no views set for forward-zone #} - -{% if zone.options -%} -{{ policy_add(policy_suffix(policy_flags(zone.options|list), policy_todname(zone.subtree|string))) }} -{%- endif %} - -{% if zone.tls -%} -{{ policy_add(policy_suffix(policy_tls_forward(zone.servers|list), policy_todname(zone.subtree|string))) }} -{% else %} -{{ policy_add(policy_suffix(policy_forward(zone.servers|list), policy_todname(zone.subtree|string))) }} -{%- endif %} - -{% endif %} -{% endfor %} -{% endif %} diff --git a/manager/knot_resolver_manager/datamodel/templates/policy.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/policy.lua.j2 deleted file mode 100644 index c5b86f745..000000000 --- a/manager/knot_resolver_manager/datamodel/templates/policy.lua.j2 +++ /dev/null @@ -1,62 +0,0 @@ -{% from 'macros/policy_macros.lua.j2' import declare_policy_qtype_custom_filter, policy_flags, policy_add, policy_auto_filter, policy_auto_action %} -{% from 'macros/view_macros.lua.j2' import view_tsig, view_addr %} - -{% if cfg.policy -%} - -{{ declare_policy_qtype_custom_filter() }} - -{% for rule in cfg.policy %} -{% if rule.views -%} -{# views set for rule #} -{% for view_id in rule.views -%} -{%- set view = cfg.views[view_id] -%} - -{# merge options from view and policy rule #} -{%- set options = none -%} -{% if rule.options and view.options -%} -{% set options = rule.options|list + view.options|list %} -{% elif rule.options %} -{% set options = rule.options|list %} -{% elif view.options %} -{% set options = view.options|list %} -{%- endif %} - -{# view tsig #} -{% if view.tsig -%} -{% for tsig in view.tsig -%} - -{% if options -%} -{{ view_tsig(tsig|string, policy_auto_filter(policy_flags(options|list), rule.filter)) }} -{%- endif %} - -{{ view_tsig(tsig|string, policy_auto_filter(policy_auto_action(rule), rule.filter)) }} - -{% endfor %} -{% endif -%} - -{# view addr #} -{% if view.subnets -%} -{% for addr in view.subnets -%} - -{% if options -%} -{{ view_addr(addr|string, policy_auto_filter(policy_flags(options|list), rule.filter)) }} -{%- endif %} - -{{ view_addr(addr|string, policy_auto_filter(policy_auto_action(rule), rule.filter)) }} - -{% endfor %} -{% endif %} - -{%- endfor -%} -{%- else -%} -{# no views set for policy rule #} - -{% if rule.options -%} -{{ policy_add(policy_auto_filter(policy_flags(rule.options|list), rule.filter)) }} -{%- endif %} - -{{ policy_add(policy_auto_filter(policy_auto_action(rule), rule.filter)) }} - -{% endif %} -{% endfor %} -{% endif %} \ No newline at end of file diff --git a/manager/knot_resolver_manager/datamodel/templates/rpz.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/rpz.lua.j2 deleted file mode 100644 index 08061c399..000000000 --- a/manager/knot_resolver_manager/datamodel/templates/rpz.lua.j2 +++ /dev/null @@ -1,57 +0,0 @@ -{% from 'macros/policy_macros.lua.j2' import policy_flags, policy_add, policy_rpz, policy_action %} -{% from 'macros/view_macros.lua.j2' import view_tsig, view_addr %} - -{% if cfg.rpz %} -{% for rpz in cfg.rpz %} -{% if rpz.views -%} -{# views set for rpz #} -{% for view_id in rpz.views -%} -{%- set view = cfg.views[view_id] -%} - -{# merge options from view and rpz #} -{%- set options = none -%} -{% if rpz.options and view.options -%} -{% set options = rpz.options|list + view.options|list %} -{% elif rpz.options %} -{% set options = rpz.options|list %} -{% elif view.options %} -{% set options = view.options|list %} -{%- endif %} - -{% if view.tsig -%} -{% for tsig in view.tsig -%} - -{%- if options -%} -{{ view_tsig(tsig|string,policy_rpz(policy_flags(rpz.options), rpz.file, rpz.watch)) }} -{%- endif %} - -{{ view_tsig(tsig|string,policy_rpz(policy_action(rpz), rpz.file, rpz.watch )) }} - -{% endfor %} -{%- endif -%} - -{% if view.subnets -%} -{% for addr in view.subnets -%} - -{%- if options -%} -{{ view_addr(addr|string,policy_rpz(policy_flags(rpz.options), rpz.file, rpz.watch)) }} -{%- endif %} - -{{ view_addr(addr|string,policy_rpz(policy_action(rpz), rpz.file, rpz.watch )) }} - -{% endfor %} -{% endif %} - -{% endfor %} -{% else %} -{# no views set for rpz #} - -{% if rpz.options -%} -{{ policy_add(policy_rpz(policy_flags(rpz.options), rpz.file, rpz.watch)) }} -{%- endif %} - -{{ policy_add(policy_rpz(policy_action(rpz), rpz.file, rpz.watch )) }} - -{% endif %} -{% endfor %} -{% endif %} \ No newline at end of file diff --git a/manager/knot_resolver_manager/datamodel/templates/slices.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/slices.lua.j2 deleted file mode 100644 index e69de29bb..000000000 diff --git a/manager/knot_resolver_manager/datamodel/templates/stub_zones.lua.j2 b/manager/knot_resolver_manager/datamodel/templates/stub_zones.lua.j2 deleted file mode 100644 index 852909826..000000000 --- a/manager/knot_resolver_manager/datamodel/templates/stub_zones.lua.j2 +++ /dev/null @@ -1,58 +0,0 @@ -{% from 'macros/policy_macros.lua.j2' import policy_flags, policy_add, policy_suffix, policy_todname, policy_stub %} -{% from 'macros/view_macros.lua.j2' import view_tsig, view_addr %} - -{% if cfg.stub_zones %} -{% for zone in cfg.stub_zones %} --- stub-zone: {{ zone.subtree }} -{% if zone.views -%} -{# views set for stub-zone #} -{% for view_id in zone.views -%} -{%- set view = cfg.views[view_id] -%} - -{# merge options from view and stub-zone #} -{%- set options = none -%} -{% if zone.options and view.options -%} -{% set options = zone.options|list + view.options|list %} -{% elif zone.options %} -{% set options = zone.options|list %} -{% elif view.options %} -{% set options = view.options|list %} -{%- endif %} - -{% if view.tsig -%} -{% for tsig in view.tsig -%} - -{%- if options -%} -{{ view_tsig(tsig|string, policy_suffix(policy_flags(options|list), policy_todname(zone.subtree|string))) }} -{%- endif %} - -{{ view_tsig(tsig|string, policy_suffix(policy_stub(zone.servers|list), policy_todname(zone.subtree|string))) }} - -{% endfor %} -{%- endif -%} - -{% if view.subnets -%} -{% for addr in view.subnets -%} - -{%- if options -%} -{{ view_addr(addr|string, policy_suffix(policy_flags(options|list), policy_todname(zone.subtree|string))) }} -{%- endif %} - -{{ view_addr(addr|string, policy_suffix(policy_stub(zone.servers|list), policy_todname(zone.subtree|string))) }} - -{% endfor %} -{% endif %} - -{% endfor %} -{% else %} -{# no views set for stub-zone #} - -{% if zone.options -%} -{{ policy_add(policy_suffix(policy_flags(zone.options|list), policy_todname(zone.subtree|string))) }} -{%- endif %} - -{{ policy_add(policy_suffix(policy_stub(zone.servers|list), policy_todname(zone.subtree|string))) }} - -{% endif %} -{% endfor %} -{% endif %} \ No newline at end of file