From 3a1fb4a884bfa16e8b2cb9f4a49801da73e7706a Mon Sep 17 00:00:00 2001
From: Vlastimil Holer <vholer@opennebula.systems>
Date: Thu, 23 Apr 2020 14:06:57 +0200
Subject: [PATCH] B #4557: Logrotates don't touch global defaults (#4592)

---
 share/pkgs/logrotate/opennebula           | 16 +++++++---------
 share/pkgs/logrotate/opennebula-econe     | 20 +++++++++-----------
 share/pkgs/logrotate/opennebula-flow      | 20 +++++++++-----------
 share/pkgs/logrotate/opennebula-gate      | 20 +++++++++-----------
 share/pkgs/logrotate/opennebula-hem       | 20 +++++++++-----------
 share/pkgs/logrotate/opennebula-novnc     | 20 +++++++++-----------
 share/pkgs/logrotate/opennebula-scheduler | 20 +++++++++-----------
 share/pkgs/logrotate/opennebula-sunstone  | 20 +++++++++-----------
 8 files changed, 70 insertions(+), 86 deletions(-)

diff --git a/share/pkgs/logrotate/opennebula b/share/pkgs/logrotate/opennebula
index d37ed3975d..1ccd62e28f 100644
--- a/share/pkgs/logrotate/opennebula
+++ b/share/pkgs/logrotate/opennebula
@@ -1,12 +1,10 @@
-delaycompress
-dateext
-dateformat -%Y%m%d-%s
-
-compress
-weekly
-rotate 52
-
-/var/log/one/one_xmlrpc.log /var/log/one/oned.log {
+/var/log/one/one_xmlrpc.log /var/log/one/oned.log /var/log/one/monitor.log {
+    delaycompress
+    dateext
+    dateformat -%Y%m%d-%s
+    compress
+    weekly
+    rotate 52
     missingok
     notifempty
     copytruncate
diff --git a/share/pkgs/logrotate/opennebula-econe b/share/pkgs/logrotate/opennebula-econe
index 6b1668e815..9af70eb67e 100644
--- a/share/pkgs/logrotate/opennebula-econe
+++ b/share/pkgs/logrotate/opennebula-econe
@@ -1,13 +1,11 @@
-delaycompress
-dateext
-dateformat -%Y%m%d-%s
-
-compress
-weekly
-rotate 52
-
 /var/log/one/econe-server.log {
-   missingok
-   notifempty
-   copytruncate
+    delaycompress
+    dateext
+    dateformat -%Y%m%d-%s
+    compress
+    weekly
+    rotate 52
+    missingok
+    notifempty
+    copytruncate
 }
diff --git a/share/pkgs/logrotate/opennebula-flow b/share/pkgs/logrotate/opennebula-flow
index 9d1fd2acfe..7767a322b3 100644
--- a/share/pkgs/logrotate/opennebula-flow
+++ b/share/pkgs/logrotate/opennebula-flow
@@ -1,13 +1,11 @@
-delaycompress
-dateext
-dateformat -%Y%m%d-%s
-
-compress
-weekly
-rotate 52
-
 /var/log/one/oneflow.log {
-   missingok
-   notifempty
-   copytruncate
+    delaycompress
+    dateext
+    dateformat -%Y%m%d-%s
+    compress
+    weekly
+    rotate 52
+    missingok
+    notifempty
+    copytruncate
 }
diff --git a/share/pkgs/logrotate/opennebula-gate b/share/pkgs/logrotate/opennebula-gate
index a586d4d68c..c15e4ee4f4 100644
--- a/share/pkgs/logrotate/opennebula-gate
+++ b/share/pkgs/logrotate/opennebula-gate
@@ -1,13 +1,11 @@
-delaycompress
-dateext
-dateformat -%Y%m%d-%s
-
-compress
-weekly
-rotate 52
-
 /var/log/one/onegate.log {
-   missingok
-   notifempty
-   copytruncate
+    delaycompress
+    dateext
+    dateformat -%Y%m%d-%s
+    compress
+    weekly
+    rotate 52
+    missingok
+    notifempty
+    copytruncate
 }
diff --git a/share/pkgs/logrotate/opennebula-hem b/share/pkgs/logrotate/opennebula-hem
index a4e9781fbf..eac069ae0a 100644
--- a/share/pkgs/logrotate/opennebula-hem
+++ b/share/pkgs/logrotate/opennebula-hem
@@ -1,13 +1,11 @@
-delaycompress
-dateext
-dateformat -%Y%m%d-%s
-
-compress
-weekly
-rotate 52
-
 /var/log/one/onehem.log {
-   missingok
-   notifempty
-   copytruncate
+    delaycompress
+    dateext
+    dateformat -%Y%m%d-%s
+    compress
+    weekly
+    rotate 52
+    missingok
+    notifempty
+    copytruncate
 }
diff --git a/share/pkgs/logrotate/opennebula-novnc b/share/pkgs/logrotate/opennebula-novnc
index 07f69163d3..9ac1d567af 100644
--- a/share/pkgs/logrotate/opennebula-novnc
+++ b/share/pkgs/logrotate/opennebula-novnc
@@ -1,13 +1,11 @@
-delaycompress
-dateext
-dateformat -%Y%m%d-%s
-
-compress
-weekly
-rotate 52
-
 /var/log/one/novnc.log {
-   missingok
-   notifempty
-   copytruncate
+    delaycompress
+    dateext
+    dateformat -%Y%m%d-%s
+    compress
+    weekly
+    rotate 52
+    missingok
+    notifempty
+    copytruncate
 }
diff --git a/share/pkgs/logrotate/opennebula-scheduler b/share/pkgs/logrotate/opennebula-scheduler
index 07752e3809..9bdf4d26a9 100644
--- a/share/pkgs/logrotate/opennebula-scheduler
+++ b/share/pkgs/logrotate/opennebula-scheduler
@@ -1,13 +1,11 @@
-delaycompress
-dateext
-dateformat -%Y%m%d-%s
-
-compress
-weekly
-rotate 52
-
 /var/log/one/sched.log {
-   missingok
-   notifempty
-   copytruncate
+    delaycompress
+    dateext
+    dateformat -%Y%m%d-%s
+    compress
+    weekly
+    rotate 52
+    missingok
+    notifempty
+    copytruncate
 }
diff --git a/share/pkgs/logrotate/opennebula-sunstone b/share/pkgs/logrotate/opennebula-sunstone
index 945885b744..84eb47b111 100644
--- a/share/pkgs/logrotate/opennebula-sunstone
+++ b/share/pkgs/logrotate/opennebula-sunstone
@@ -1,13 +1,11 @@
-delaycompress
-dateext
-dateformat -%Y%m%d-%s
-
-compress
-weekly
-rotate 52
-
 /var/log/one/sunstone.log {
-   missingok
-   notifempty
-   copytruncate
+    delaycompress
+    dateext
+    dateformat -%Y%m%d-%s
+    compress
+    weekly
+    rotate 52
+    missingok
+    notifempty
+    copytruncate
 }