From f38ce741c2852e4eaeeaa23736960d9a717b600f Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 1 May 2022 20:43:45 +0200
Subject: system-logs: T4353: fix Jinja2 linting errors

---
 data/templates/logs/logrotate/vyos-atop.j2      | 20 ++++++++++++++++++++
 data/templates/logs/logrotate/vyos-atop.tmpl    | 20 --------------------
 data/templates/logs/logrotate/vyos-rsyslog.j2   | 13 +++++++++++++
 data/templates/logs/logrotate/vyos-rsyslog.tmpl | 13 -------------
 src/conf_mode/system-logs.py                    |  4 ++--
 5 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100644 data/templates/logs/logrotate/vyos-atop.j2
 delete mode 100644 data/templates/logs/logrotate/vyos-atop.tmpl
 create mode 100644 data/templates/logs/logrotate/vyos-rsyslog.j2
 delete mode 100644 data/templates/logs/logrotate/vyos-rsyslog.tmpl

diff --git a/data/templates/logs/logrotate/vyos-atop.j2 b/data/templates/logs/logrotate/vyos-atop.j2
new file mode 100644
index 000000000..2d078f379
--- /dev/null
+++ b/data/templates/logs/logrotate/vyos-atop.j2
@@ -0,0 +1,20 @@
+/var/log/atop/atop.log {
+    daily
+    dateext
+    dateformat _%Y-%m-%d_%H-%M-%S
+    maxsize {{ max_size }}M
+    missingok
+    nocompress
+    nocreate
+    nomail
+    rotate {{ rotate }}
+    prerotate
+        # stop the service
+        systemctl stop atop.service
+    endscript
+    postrotate
+        # start atop service again
+        systemctl start atop.service
+    endscript
+}
+
diff --git a/data/templates/logs/logrotate/vyos-atop.tmpl b/data/templates/logs/logrotate/vyos-atop.tmpl
deleted file mode 100644
index 2d078f379..000000000
--- a/data/templates/logs/logrotate/vyos-atop.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-/var/log/atop/atop.log {
-    daily
-    dateext
-    dateformat _%Y-%m-%d_%H-%M-%S
-    maxsize {{ max_size }}M
-    missingok
-    nocompress
-    nocreate
-    nomail
-    rotate {{ rotate }}
-    prerotate
-        # stop the service
-        systemctl stop atop.service
-    endscript
-    postrotate
-        # start atop service again
-        systemctl start atop.service
-    endscript
-}
-
diff --git a/data/templates/logs/logrotate/vyos-rsyslog.j2 b/data/templates/logs/logrotate/vyos-rsyslog.j2
new file mode 100644
index 000000000..f2e4d2ab2
--- /dev/null
+++ b/data/templates/logs/logrotate/vyos-rsyslog.j2
@@ -0,0 +1,13 @@
+/var/log/messages {
+    create
+    missingok
+    nomail
+    notifempty
+    rotate {{ rotate }}
+    size {{ max_size }}M
+    postrotate
+        # inform rsyslog service about rotation
+        /usr/lib/rsyslog/rsyslog-rotate
+    endscript
+}
+
diff --git a/data/templates/logs/logrotate/vyos-rsyslog.tmpl b/data/templates/logs/logrotate/vyos-rsyslog.tmpl
deleted file mode 100644
index f2e4d2ab2..000000000
--- a/data/templates/logs/logrotate/vyos-rsyslog.tmpl
+++ /dev/null
@@ -1,13 +0,0 @@
-/var/log/messages {
-    create
-    missingok
-    nomail
-    notifempty
-    rotate {{ rotate }}
-    size {{ max_size }}M
-    postrotate
-        # inform rsyslog service about rotation
-        /usr/lib/rsyslog/rsyslog-rotate
-    endscript
-}
-
diff --git a/src/conf_mode/system-logs.py b/src/conf_mode/system-logs.py
index e6296656d..c71938a79 100755
--- a/src/conf_mode/system-logs.py
+++ b/src/conf_mode/system-logs.py
@@ -57,13 +57,13 @@ def generate(logs_config):
     logrotate_atop = dict_search('logrotate.atop', logs_config)
     # generate new config file for atop
     syslog.debug('Adding logrotate config for atop')
-    render(logrotate_atop_file, 'logs/logrotate/vyos-atop.tmpl', logrotate_atop)
+    render(logrotate_atop_file, 'logs/logrotate/vyos-atop.j2', logrotate_atop)
 
     # get configuration for logrotate rsyslog
     logrotate_rsyslog = dict_search('logrotate.messages', logs_config)
     # generate new config file for rsyslog
     syslog.debug('Adding logrotate config for rsyslog')
-    render(logrotate_rsyslog_file, 'logs/logrotate/vyos-rsyslog.tmpl',
+    render(logrotate_rsyslog_file, 'logs/logrotate/vyos-rsyslog.j2',
            logrotate_rsyslog)
 
 
-- 
cgit v1.2.3