From 2f1373fbcb0de83f272f8cb2934f05871850a18c Mon Sep 17 00:00:00 2001
From: Jan-Philipp Benecke <jpb@cleverreach.com>
Date: Mon, 21 Dec 2020 09:46:42 +0100
Subject: flow-accounting: T3141: remove legacy jinja2 template

---
 data/templates/netflow/uacctd.conf.tmpl | 41 +++++++++++++++------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/data/templates/netflow/uacctd.conf.tmpl b/data/templates/netflow/uacctd.conf.tmpl
index 3d4df72f7..1c183bb20 100644
--- a/data/templates/netflow/uacctd.conf.tmpl
+++ b/data/templates/netflow/uacctd.conf.tmpl
@@ -19,28 +19,25 @@ syslog: {{ templatecfg['syslog-facility'] }}
 imt_path: /tmp/uacctd.pipe
 imt_mem_pools_number: 169
 {% endif %}
-plugins:
-{%- if templatecfg['netflow']['servers'] != none -%}
-    {%- for server in templatecfg['netflow']['servers'] -%}
-        {%- if loop.last -%}nfprobe[nf_{{ server['address'] }}]{%- else -%}nfprobe[nf_{{ server['address'] }}],{%- endif -%}
-    {%- endfor -%}
-    {%- set plugins_presented = true -%}
-{%- endif -%}
-{%- if templatecfg['sflow']['servers'] != none -%}
-    {%- if plugins_presented -%}
-        {%- for server in templatecfg['sflow']['servers'] -%}
-            ,sfprobe[sf_{{ server['address'] }}]
-        {%- endfor -%}
-    {%- else -%}
-        {%- for server in templatecfg['sflow']['servers'] -%}
-            {%- if loop.last -%}sfprobe[sf_{{ server['address'] }}]{%- else -%}sfprobe[sf_{{ server['address'] }}],{%- endif -%}
-        {%- endfor -%}
-    {%- endif -%}
-    {%- set plugins_presented = true -%}
-{%- endif -%}
-{%- if templatecfg['disable-imt'] == none %}
-    {%- if plugins_presented %},memory{%- else -%}memory{%- endif -%}
-{%- endif -%}
+plugins: {% if templatecfg['netflow']['servers'] != none %}
+{%   for server in templatecfg['netflow']['servers'] %}
+{%     if loop.last %}nfprobe[nf_{{ server['address'] }}]{% else %}nfprobe[nf_{{ server['address'] }}],{% endif %}
+{%   endfor %}
+{% set plugins_presented = true %}
+{% endif %}
+{% if templatecfg['sflow']['servers'] != none %}
+{%   if plugins_presented %}
+{%     for server in templatecfg['sflow']['servers'] %},sfprobe[sf_{{ server['address'] }}]{% endfor %}
+{%   else %}
+{%     for server in templatecfg['sflow']['servers'] %}
+{%       if loop.last %}sfprobe[sf_{{ server['address'] }}]{% else %}sfprobe[sf_{{ server['address'] }}],{% endif %}
+{%     endfor %}
+{%   endif %}
+{% set plugins_presented = true %}
+{% endif %}
+{% if templatecfg['disable-imt'] == none %}
+{%   if plugins_presented %},memory{% else %}memory{% endif %}
+{% endif %}
 
 {% if templatecfg['netflow']['servers'] != none %}
 {% for server in templatecfg['netflow']['servers'] %}
-- 
cgit v1.2.3