From: Philip Prindeville <redacted>
Date: Tue, 25 Jul 2017 20:13:53 +0000 (-0600)
Subject: syslog-ng: replace hardcoded paths with variables
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=1923459f4e20731d12c9deb41cdd28c289d0c4a7;p=openwrt-packages.git

syslog-ng: replace hardcoded paths with variables

Signed-off-by: Philip Prindeville <redacted>
---

diff --git a/admin/syslog-ng/files/syslog-ng.init b/admin/syslog-ng/files/syslog-ng.init
index cecb3f904..6036dd900 100644
--- a/admin/syslog-ng/files/syslog-ng.init
+++ b/admin/syslog-ng/files/syslog-ng.init
@@ -2,18 +2,23 @@
 # Copyright (C) 2006-2016 OpenWrt.org
 
 START=20
+PROG=/usr/sbin/syslog-ng
+PROG2=/usr/sbin/syslog-ng-ctl
 
 SERVICE_USE_PID=1
+SERVICE_PID_FILE=/var/log/syslog-ng.pid
+
+config_file=/etc/syslog-ng.conf
 
 start() {
-	[ -f /etc/syslog-ng.conf ] || return 1
-	service_start /usr/sbin/syslog-ng
+	[ -f $config_file ] || return 1
+	service_start $PROG -p $SERVICE_PID_FILE
 }
 
 stop() {
-	service_stop /usr/sbin/syslog-ng
+	service_stop $PROG
 }
 
 reload() {
-	service_reload /usr/sbin/syslog-ng
+	service_reload $PROG
 }