Browse Source

fix broken call to rc and add additional log file variable, both improvements as specified by Cyrus HAMIDI

Ralf S. Engelschall 21 years ago
parent
commit
dacdd6dbd5
2 changed files with 5 additions and 4 deletions
  1. 4 3
      syslog-ng/rc.syslog-ng
  2. 1 1
      syslog-ng/syslog-ng.spec

+ 4 - 3
syslog-ng/rc.syslog-ng

@@ -11,6 +11,7 @@
     syslog_ng_log_numfiles="10"
     syslog_ng_log_minsize="1M"
     syslog_ng_log_complevel="9"
+    syslog_ng_additional_logs=""
 
 %common
     syslog_ng_cfgfile="@l_prefix@/etc/syslog-ng/syslog-ng.conf"
@@ -46,7 +47,7 @@
 %restart -p 100 -u @l_susr@
     rcService syslog-ng enable yes || exit 0
     rcService syslog-ng active no  && exit 0
-    rc syslog_ng stop start
+    rc syslog-ng stop start
 
 %daily -u @l_susr@
     rcService syslog-ng enable yes || exit 0
@@ -54,6 +55,6 @@
         -n ${syslog_ng_log_numfiles} -s ${syslog_ng_log_minsize} -d \
         -z ${syslog_ng_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
         -P "${syslog_ng_log_prolog}" \
-        -E "${syslog_ng_log_epilog} && rc syslog_ng restart" \
-        @l_prefix@/var/syslog-ng/syslog-ng.log
+        -E "${syslog_ng_log_epilog} && rc syslog-ng restart" \
+        @l_prefix@/var/syslog-ng/syslog-ng.log ${syslog_ng_additional_logs}
 

+ 1 - 1
syslog-ng/syslog-ng.spec

@@ -40,7 +40,7 @@ Class:        PLUS
 Group:        System
 License:      GPL
 Version:      %{V_sl_major}.%{V_sl_minor}
-Release:      20040506
+Release:      20040510
 
 #   list of sources
 Source0:      http://www.balabit.com/downloads/syslog-ng/%{V_sl_major}/src/syslog-ng-%{V_sl_major}.%{V_sl_minor}.tar.gz