CA-389496: Avoid configuration conflicts for rotating xapi logs

The custom logrotation setup for xapi sometimes conflicted with the normal one.
Remove the former.

Install the xapi logrotate configuration has been moved to be managed as part
of the normal logrotation, with the global settings removed.

Duplicate settings in the configuration have been removed.

Signed-off-by: Pau Ruiz Safont <[email protected]>

(cherry picked from commit 51521bf)
Signed-off-by: Pau Ruiz Safont <[email protected]>

scripts/Makefile

@@ -38,8 +38,7 @@ install:
 	$(IPROG) xapi-health-check $(DESTDIR)$(LIBEXECDIR)
 	$(IPROG) mail-alarm $(DESTDIR)$(LIBEXECDIR)
 	$(IDATA) audit-logrotate $(DESTDIR)/etc/logrotate.d/audit
-	$(IDATA) xapi-logrotate.conf $(DESTDIR)$(ETCDIR)
-	$(IPROG) xapi-logrotate.sh $(DESTDIR)$(LIBEXECDIR)
+	$(IDATA) xapi-logrotate.conf $(DESTDIR)/etc/logrotate.d/xapi
 	$(IPROG) xapi-wait-init-complete $(DESTDIR)$(BINDIR)
 	$(IPROG) xapi-autostart-vms $(DESTDIR)$(BINDIR)
 	$(IPROG) udhcpd.skel $(DESTDIR)$(ETCDIR)/udhcpd.skel
@@ -140,8 +139,6 @@ install:
 	mkdir -p $(DESTDIR)/etc/cron.daily
 	$(IPROG) license-check $(DESTDIR)/etc/cron.daily/
 	$(IPROG) certificate-check $(DESTDIR)/etc/cron.daily/
-	mkdir -p $(DESTDIR)/etc/cron.d
-	$(IDATA) xapi-logrotate.cron $(DESTDIR)/etc/cron.d/xapi-logrotate.cron
 	mkdir -p $(DESTDIR)/opt/xensource/gpg
 # templates
 	$(IPROG) templates/debian $(DESTDIR)$(OPTDIR)/packages/post-install-scripts/debian-etch

scripts/xapi-logrotate.conf

@@ -1,20 +1,3 @@
-# see "man logrotate" for details
-# rotate log files daily
-daily
-
-# keep one months worth of backlogs
-rotate 31
-
-# create new (empty) log files after rotating old ones
-create
-
-# compress log files
-compress
-delaycompress
-
-# All the general settings above are copied from /etc/logrotate.conf
-# as installed by the logrotate RPM.
-
 /var/log/xensource.log {
     missingok
 
@@ -26,9 +9,6 @@ delaycompress
     # When rotating, remove any rotated logs older than this many days.
     maxage 31
 
-    # Rotate when file exceeds this size, even if we rotated it today already.
-    maxsize 100M
-
     # Keep up to this many old files.
     # (When considering total size, expect a compression factor around 10-20.)
     rotate 100