From 85f76e7fb4efaed5222cc77ff01fc669ecd3a06b 2018-12-17 13:42:09
From: Richard H <chain@rpgfiction.net>
Date: 2018-12-17 13:42:09
Subject: [PATCH] last rites for net-analyzer/centreon

---

diff --git a/net-analyzer/centreon/files/centreon-2.cron b/net-analyzer/centreon/files/centreon-2.cron
index bb7b8557f9ba3a9bd71fb6f2be70597cf5783f01..f413605d28ef3c7bdadb95f2de1afbbd6a144ddd 100644
--- a/net-analyzer/centreon/files/centreon-2.cron
+++ b/net-analyzer/centreon/files/centreon-2.cron
@@ -1,8 +1,12 @@
+CONF_DIR=/etc/centreon
 OREON_DIR=/usr/share/centreon
 LOG_DIR=/var/log/centreon
 
-*/2 * * * *    nagios /usr/bin/php -q ${OREON_DIR}/cron/centAcl.php 2>&1 >> ${LOG_DIR}/centAcl.log
-#0 1 1-31 * * nagios /usr/bin/perl ${OREON_DIR}/cron/archiveDayLog 2>&1 >> ${LOG_DIR}/archiveDayLog.log
-* * * * *    nagios /usr/sbin/logAnalyser 2>&1 >> ${LOG_DIR}/logAnalyser.log
-*/5 * * * *    nagios /usr/sbin/nagiosPerfTrace 2>&1 >> ${LOG_DIR}/nagiosPerfTrace.log
-0 2 * * *    nagios ${OREON_DIR}/cron/centreonPurge.sh 2>&1 >> ${LOG_DIR}/centreonPurge.log
+* * * * *	nagios	/usr/bin/php -q ${OREON_DIR}/cron/centAcl.php >> ${LOG_DIR}/centAcl.log 2>&1
+*/5 * * * *	nagios	/usr/bin/php -q ${OREON_DIR}/cron/downtimeManager.php >> ${LOG_DIR}/downtimeManager.log 2>&1
+0 3 * * *	nagios	/usr/bin/perl ${OREON_DIR}/cron/eventReportBuilder --config=${CONF_DIR}/conf.pm >> ${LOG_DIR}/eventReportBuilder.log 2>&1
+0 6 * * *	nagios	/usr/bin/perl ${OREON_DIR}/cron/dashboardBuilder --config=${CONF_DIR}/conf.pm >> ${LOG_DIR}/dashboardBuilder.log 2>&1
+
+* * * * *	nagios	/usr/bin/perl ${OREON_DIR}/cron/logAnalyser --config=${CONF_DIR}/conf.pm >> ${LOG_DIR}/logAnalyser.log 2>&1
+*/5 * * * * nagios	/usr/bin/perl ${OREON_DIR}/cron/nagiosPerfTrace --config=${CONF_DIR}/conf.pm >> ${LOG_DIR}/nagiosPerfTrace.log 2>&1
+0 2 * * *	nagios	/usr/bin/perl ${OREON_DIR}/cron/centstorage_purge --config=${CONF_DIR}/conf.pm >> ${LOG_DIR}/centreon-purge.log 2>&1
diff --git a/net-analyzer/centreon/files/centreon.initd b/net-analyzer/centreon/files/centreon.initd
old mode 100644
new mode 100755
index 3ab9e4fd8b1e392f0d8d712bc382e99821f3b1d7..06f8195e1b87e8742a7b037b9e37e3bd324bbef2
--- a/net-analyzer/centreon/files/centreon.initd
+++ b/net-analyzer/centreon/files/centreon.initd
@@ -9,18 +9,20 @@ depend() {
 
 start() {
 	ebegin "Starting CentCore"
-	start-stop-daemon --start --pidfile /run/centreon/centcore.pid \
+	start-stop-daemon --background --start -m --pidfile /run/centreon/centcore.pid \
 		--user nagios --chuid nagios \
 		--group nagios \
-		--startas /usr/sbin/centcore -- \
-		>> /var/log/centreon/centcore.log 2>&1
+		--startas /usr/sbin/centcore \
+		--stdout /var/log/centreon/centcore.log \
+		--stderr /var/log/centreon/centcore.log --
 	eend
         ebegin "Starting CentStorage Collector"
-        start-stop-daemon --start --pidfile /run/centreon/centstorage.pid \
+        start-stop-daemon --background --start -m --pidfile /run/centreon/centstorage.pid \
                 --user nagios --chuid nagios \
                 --group nagios \
-		--startas /usr/sbin/centstorage -- \
-		>> /var/log/centreon/centstorage.log 2>&1
+		--startas /usr/sbin/centstorage \
+		--stdout /var/log/centreon/centstorage.log \
+		--stderr /var/log/centreon/centstorage.log --
         eend
 }