syslog: T4353: fix Jinja2 linting errors

3 files changed, 27 insertions, 27 deletions

diff --git a/data/templates/syslog/logrotate.tmpl b/data/templates/syslog/logrotate.j2
index c1b951e8b..c1b951e8b 100644
--- a/data/templates/syslog/logrotate.tmpl
+++ b/data/templates/syslog/logrotate.j2
diff --git a/data/templates/syslog/rsyslog.conf.tmpl b/data/templates/syslog/rsyslog.conf.j2
index 2fb621760..4445d568b 100644
--- a/data/templates/syslog/rsyslog.conf.tmpl
+++ b/data/templates/syslog/rsyslog.conf.j2
@@ -2,9 +2,9 @@
 ## file based logging
 {% if files['global']['marker'] %}
 $ModLoad immark
-{%   if files['global']['marker-interval'] %}
-$MarkMessagePeriod  {{files['global']['marker-interval']}}
-{%   endif %}
+{%     if files['global']['marker-interval'] %}
+$MarkMessagePeriod {{ files['global']['marker-interval'] }}
+{%     endif %}
 {% endif %}
 {% if files['global']['preserver_fqdn'] %}
 $PreserveFQDN on
@@ -15,40 +15,40 @@ $outchannel {{ file }},{{ file_options['log-file'] }},{{ file_options['max-size'
 {% endfor %}
 {% if console is defined and console is not none %}
 ## console logging
-{%   for con, con_options in console.items() %}
+{%     for con, con_options in console.items() %}
 {{ con_options['selectors'] }} /dev/console
-{%   endfor %}
+{%     endfor %}
 {% endif %}
 {% if hosts is defined and hosts is not none %}
 ## remote logging
-{%   for host, host_options in hosts.items() %}
-{%     if host_options.proto == 'tcp' %}
-{%       if host_options.port is defined %}
-{%         if host_options.oct_count is defined %}
+{%     for host, host_options in hosts.items() %}
+{%         if host_options.proto == 'tcp' %}
+{%             if host_options.port is defined %}
+{%                 if host_options.oct_count is defined %}
 {{ host_options.selectors }} @@(o){{ host | bracketize_ipv6 }}:{{ host_options.port }};RSYSLOG_SyslogProtocol23Format
-{%         else %}
+{%                 else %}
 {{ host_options.selectors }} @@{{ host | bracketize_ipv6 }}:{{ host_options.port }}
-{%         endif %}
-{%       else %}
+{%                 endif %}
+{%             else %}
 {{ host_options.selectors }} @@{{ host | bracketize_ipv6 }}
-{%       endif %}
-{%     elif host_options.proto == 'udp' %}
-{%       if host_options.port is defined %}
+{%             endif %}
+{%         elif host_options.proto == 'udp' %}
+{%             if host_options.port is defined %}
 {{ host_options.selectors }} @{{ host | bracketize_ipv6 }}:{{ host_options.port }}{{ ';RSYSLOG_SyslogProtocol23Format' if host_options.oct_count is sameas true }}
-{%       else %}
+{%             else %}
 {{ host_options.selectors }} @{{ host | bracketize_ipv6 }}
-{%       endif %}
-{%     else %}
-{%       if host_options['port'] %}
+{%             endif %}
+{%         else %}
+{%             if host_options['port'] %}
 {{ host_options.selectors }} @{{ host | bracketize_ipv6 }}:{{ host_options.port }}
-{%       else %}
+{%             else %}
 {{ host_options.selectors }} @{{ host | bracketize_ipv6 }}
-{%       endif %}
-{%     endif %}
-{%   endfor %}
+{%             endif %}
+{%         endif %}
+{%     endfor %}
 {% endif %}
 {% if user is defined and user is not none %}
-{%   for username, user_options in user.items() %}
+{%     for username, user_options in user.items() %}
 {{ user_options.selectors }} :omusrmsg:{{ username }}
-{%   endfor %}
+{%     endfor %}
 {% endif %}
diff --git a/src/conf_mode/system-syslog.py b/src/conf_mode/system-syslog.py
index 309b4bdb0..a9d3bbe31 100755
--- a/src/conf_mode/system-syslog.py
+++ b/src/conf_mode/system-syslog.py
@@ -204,7 +204,7 @@ def generate(c):
         return None
 
     conf = '/etc/rsyslog.d/vyos-rsyslog.conf'
-    render(conf, 'syslog/rsyslog.conf.tmpl', c)
+    render(conf, 'syslog/rsyslog.conf.j2', c)
 
     # cleanup current logrotate config files
     logrotate_files = Path('/etc/logrotate.d/').glob('vyos-rsyslog-generated-*')
@@ -216,7 +216,7 @@ def generate(c):
     for filename, fileconfig in c.get('files', {}).items():
         if fileconfig['log-file'].startswith('/var/log/user/'):
             conf = '/etc/logrotate.d/vyos-rsyslog-generated-' + filename
-            render(conf, 'syslog/logrotate.tmpl', { 'config_render': fileconfig })
+            render(conf, 'syslog/logrotate.j2', { 'config_render': fileconfig })
 
 
 def verify(c):