From 75a10035aff32ec840f6b18a09702f9755c593df Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Wed, 30 Jul 2014 20:39:55 -0700
Subject: [PATCH] CentOS 7 support

---
 syslog/config-CentOS-Linux-6.0-*            | 6 +++---
 syslog/config-Redhat-Enterprise-Linux-6.0-* | 6 +++---
 syslog/config.info                          | 2 +-
 syslog/syslog-lib.pl                        | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/syslog/config-CentOS-Linux-6.0-* b/syslog/config-CentOS-Linux-6.0-*
index c3d60a6d2..a29fde537 100644
--- a/syslog/config-CentOS-Linux-6.0-*
+++ b/syslog/config-CentOS-Linux-6.0-*
@@ -3,7 +3,7 @@ syslogd=/sbin/rsyslogd
 m4_conf=0
 syslog_conf=/etc/rsyslog.conf
 pri_dir=1
-pid_file=/var/run/rsyslogd.pid
+pid_file=/var/run/rsyslogd.pid /run/rsyslogd.pid
 facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
 m4_path=
 sync=1
@@ -19,7 +19,7 @@ file_/var/log/news.crit=desc_news
 file_/var/log/news.err=desc_news
 file_/var/log/news.notice=desc_news
 socket=0
-start_cmd=/etc/init.d/rsyslog start
-restart_cmd=/etc/init.d/rsyslog reload
+start_cmd=service rsyslog start
+restart_cmd=service rsyslog reload
 compressed=1
 others=1
diff --git a/syslog/config-Redhat-Enterprise-Linux-6.0-* b/syslog/config-Redhat-Enterprise-Linux-6.0-*
index c3d60a6d2..a29fde537 100644
--- a/syslog/config-Redhat-Enterprise-Linux-6.0-*
+++ b/syslog/config-Redhat-Enterprise-Linux-6.0-*
@@ -3,7 +3,7 @@ syslogd=/sbin/rsyslogd
 m4_conf=0
 syslog_conf=/etc/rsyslog.conf
 pri_dir=1
-pid_file=/var/run/rsyslogd.pid
+pid_file=/var/run/rsyslogd.pid /run/rsyslogd.pid
 facilities=auth authpriv cron daemon kern lpr mail mark news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7
 m4_path=
 sync=1
@@ -19,7 +19,7 @@ file_/var/log/news.crit=desc_news
 file_/var/log/news.err=desc_news
 file_/var/log/news.notice=desc_news
 socket=0
-start_cmd=/etc/init.d/rsyslog start
-restart_cmd=/etc/init.d/rsyslog reload
+start_cmd=service rsyslog start
+restart_cmd=service rsyslog reload
 compressed=1
 others=1
diff --git a/syslog/config.info b/syslog/config.info
index 8bc00df4e..028b6287d 100644
--- a/syslog/config.info
+++ b/syslog/config.info
@@ -14,7 +14,7 @@ socket=Logging to sockets supported?,1,1-Yes,0-No
 pri_dir=Advanced priority selection supported?,1,2-FreeBSD style,1-Linux style,0-No
 pri_all=All priorities supported?,1,1-Yes,0-No
 tags=Tagged sections supported?,1,1-Yes,0-No
-pid_file=Syslog PID file,3,None
+pid_file=Syslog PID file(s),3,None
 syslogd=Path to syslog server,0
 facilities=Supported facilities,0
 start_cmd=Command to start syslog,3,Just run server
diff --git a/syslog/syslog-lib.pl b/syslog/syslog-lib.pl
index 7a292bcb6..fcf2236bc 100755
--- a/syslog/syslog-lib.pl
+++ b/syslog/syslog-lib.pl
@@ -233,7 +233,7 @@ sub get_syslog_pid
 {
 local $pid;
 if ($config{'pid_file'}) {
-	foreach my $pfile (glob($config{'pid_file'})) {
+	foreach my $pfile (map { glob($_) } split(/\s+/, $config{'pid_file'})) {
 		my $poss = &check_pid_file($pfile);
 		if ($poss) {
 			$pid = $poss;