CA-389496: Avoid conflicts when rotating xapi logs

The custom logrotation 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.

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

scripts/Makefile

@@ -45,8 +45,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)$(ETCXENDIR)
-	$(IPROG) xapi-logrotate.sh $(DESTDIR)$(LIBEXECDIR)
+	$(IDATA) xapi-logrotate.conf $(DESTDIR)/etc/logrotate.d/xapi
 	$(IPROG) xapi-tracing-log-trim.sh $(DESTDIR)$(LIBEXECDIR)
 	$(IPROG) xapi-wait-init-complete $(DESTDIR)$(OPTDIR)/bin
 	$(IPROG) xapi-autostart-vms $(DESTDIR)$(OPTDIR)/bin
@@ -158,7 +157,6 @@ install:
 	$(IPROG) certificate-check $(DESTDIR)/etc/cron.daily/
 	$(IPROG) certificate-refresh $(DESTDIR)/etc/cron.hourly/
 	mkdir -p $(DESTDIR)/etc/cron.d
-	$(IDATA) xapi-logrotate.cron $(DESTDIR)/etc/cron.d/xapi-logrotate.cron
 	$(IDATA) xapi-tracing-log-trim.cron $(DESTDIR)/etc/cron.d/xapi-tracing-log-trim.cron
 	mkdir -p $(DESTDIR)/opt/xensource/gpg
 # templates

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