CentOS 7 support

This commit is contained in:
Jamie Cameron
2014-07-30 20:39:55 -07:00
parent bf8cd8a756
commit 75a10035af
4 changed files with 8 additions and 8 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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;