From 48319653301a7fac2bf622fdb7bebe7cd595cd58 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 28 Jul 2015 21:12:35 +0200
Subject: Bug #4612 - fix syslog-ng logrotate cron job

Fix the path to logrotate binary.
---
 config/syslog-ng/syslog-ng.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/syslog-ng')

diff --git a/config/syslog-ng/syslog-ng.inc b/config/syslog-ng/syslog-ng.inc
index bbec3a7c..1643c03f 100644
--- a/config/syslog-ng/syslog-ng.inc
+++ b/config/syslog-ng/syslog-ng.inc
@@ -165,7 +165,7 @@ function syslogng_install_cron($should_install) {
 				$cron_item['month'] = "*";
 				$cron_item['wday'] = "*";
 				$cron_item['who'] = "root";
-				$cron_item['command'] = "/usr/bin/nice -n20 /usr/local/sbin/logrotate /usr/local/etc/logrotate.conf";
+				$cron_item['command'] = "/usr/bin/nice -n20 " . SYSLOGNG_BASEDIR .  "local/sbin/logrotate /usr/local/etc/logrotate.conf";
 				$config['cron']['item'][] = $cron_item;
 				$need_write = true;
 			}
-- 
cgit v1.2.3


From b85ea15c38d614686c9b69ccdb3e1c79f4a4c528 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 28 Jul 2015 21:38:13 +0200
Subject: Remove logrotate.conf on package deinstall

Do not leave stale files behind on package removal.
---
 config/syslog-ng/syslog-ng.inc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config/syslog-ng')

diff --git a/config/syslog-ng/syslog-ng.inc b/config/syslog-ng/syslog-ng.inc
index 1643c03f..cb0aafb3 100644
--- a/config/syslog-ng/syslog-ng.inc
+++ b/config/syslog-ng/syslog-ng.inc
@@ -69,6 +69,7 @@ function syslogng_deinstall_command() {
 	if (is_link("/usr/local/lib/syslog-ng"))
 		unlink_if_exists("/usr/local/lib/syslog-ng");
 	syslogng_install_cron(false);
+	unlink_if_exists("/usr/local/etc/logrotate.conf");
 	conf_mount_ro();
 	filter_configure();
 }
-- 
cgit v1.2.3


From 50cb17b04cc62e7d01269287568f35ca9fd2a11d Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 28 Jul 2015 21:43:11 +0200
Subject: Remove syslog-ng.conf on package deinstall

Another leftover.
---
 config/syslog-ng/syslog-ng.inc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config/syslog-ng')

diff --git a/config/syslog-ng/syslog-ng.inc b/config/syslog-ng/syslog-ng.inc
index cb0aafb3..56decfad 100644
--- a/config/syslog-ng/syslog-ng.inc
+++ b/config/syslog-ng/syslog-ng.inc
@@ -70,6 +70,7 @@ function syslogng_deinstall_command() {
 		unlink_if_exists("/usr/local/lib/syslog-ng");
 	syslogng_install_cron(false);
 	unlink_if_exists("/usr/local/etc/logrotate.conf");
+	unlink_if_exists("/usr/local/etc/syslog-ng.conf");
 	conf_mount_ro();
 	filter_configure();
 }
-- 
cgit v1.2.3