rjw | 1f88458 | 2022-01-06 17:20:42 +0800 | [diff] [blame^] | 1 | From 0be9c08dd3f825e92fa02d4a08d8aff743109e61 Mon Sep 17 00:00:00 2001 |
| 2 | From: Li xin <lixin.fnst@cn.fujitsu.com> |
| 3 | Date: Wed, 17 Jun 2015 14:46:30 +0900 |
| 4 | Subject: [PATCH] syslog-ng.service: the syslog-ng service can not start |
| 5 | successfully,so modify it. |
| 6 | |
| 7 | Upstream-Status: pending |
| 8 | |
| 9 | Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> |
| 10 | Updated-by: Andrej Valek <andrej.valek@siemens.com> |
| 11 | --- |
| 12 | contrib/systemd/syslog-ng.service | 5 ++--- |
| 13 | 1 file changed, 2 insertion(+), 3 deletions(-) |
| 14 | |
| 15 | diff --git a/contrib/systemd/syslog-ng@.service b/contrib/systemd/syslog-ng@.service |
| 16 | index a28640e..93aec94 100644 |
| 17 | --- a/contrib/systemd/syslog-ng@.service |
| 18 | +++ b/contrib/systemd/syslog-ng@.service |
| 19 | @@ -7,8 +7,8 @@ Conflicts=emergency.service emergency.target |
| 20 | Type=notify |
| 21 | EnvironmentFile=-/etc/default/syslog-ng@%i |
| 22 | EnvironmentFile=-/etc/sysconfig/syslog-ng@%i |
| 23 | -ExecStart=/usr/sbin/syslog-ng -F $OTHER_OPTIONS --cfgfile $CONFIG_FILE --control $CONTROL_FILE --persist-file $PERSIST_FILE --pidfile $PID_FILE |
| 24 | -ExecReload=/bin/kill -HUP $MAINPID |
| 25 | +ExecStart=@SBINDIR@/syslog-ng -F $OTHER_OPTIONS --cfgfile $CONFIG_FILE --control $CONTROL_FILE --persist-file $PERSIST_FILE --pidfile $PID_FILE |
| 26 | +ExecReload=@BASEBINDIR@/kill -HUP $MAINPID |
| 27 | StandardOutput=journal |
| 28 | StandardError=journal |
| 29 | Restart=on-failure |
| 30 | diff --git a/contrib/systemd/syslog-ng@default b/contrib/systemd/syslog-ng@default |
| 31 | index 02da288..3a8215d 100644 |
| 32 | --- a/contrib/systemd/syslog-ng@default |
| 33 | +++ b/contrib/systemd/syslog-ng@default |
| 34 | @@ -1,5 +1,5 @@ |
| 35 | -CONFIG_FILE=/etc/syslog-ng.conf |
| 36 | -PERSIST_FILE=/var/lib/syslog-ng/syslog-ng.persist |
| 37 | -CONTROL_FILE=/var/lib/syslog-ng/syslog-ng.ctl |
| 38 | -PID_FILE=/var/run/syslog-ng.pid |
| 39 | +CONFIG_FILE=/etc/syslog-ng/syslog-ng.conf |
| 40 | +PERSIST_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.persist |
| 41 | +CONTROL_FILE=@LOCALSTATEDIR@/lib/syslog-ng/syslog-ng.ctl |
| 42 | +PID_FILE=@LOCALSTATEDIR@/run/syslog-ng.pid |
| 43 | OTHER_OPTIONS="--enable-core" |
| 44 | |
| 45 | -- |
| 46 | 1.8.4.2 |