Michael van Elst před 23 roky
rodič
revize
973660658e
6 změnil soubory, kde provedl 9 přidání a 12 odebrání
  1. 2 2
      inn/inn.spec
  2. 0 6
      inn/rc.inn
  3. 3 2
      monit/monit.spec
  4. 1 1
      monit/rc.monit
  5. 2 0
      nsd/nsd.spec
  6. 1 1
      nsd/rc.nsd

+ 2 - 2
inn/inn.spec

@@ -178,8 +178,8 @@ AutoReqProv:  no
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
-        -e 's;@l_musr@;%{l_musr};g' \
-        -e 's;@l_mgrp@;%{l_mgrp};g' \
+        -e 's;@l_rusr@;%{l_rusr};g' \
+        -e 's;@l_rgrp@;%{l_rgrp};g' \
         %{SOURCE rc.inn} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 

+ 0 - 6
inn/rc.inn

@@ -33,12 +33,6 @@
 %daily -u @l_rusr@
     opServiceEnabled inn || exit 0
     @l_prefix@/libexec/inn/news.daily expireover lowmark delayrm
-    shtool rotate -f \
-        -n${inn_log_numfiles} -s${inn_log_minsize} -d \
-        -z${inn_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-        -P "${inn_log_prolog}" \
-        -E "${inn_log_epilog}" \
-        @l_prefix@/var/inn/log/*.log
 
     #   rotate logfile
     shtool rotate -f \

+ 3 - 2
monit/monit.spec

@@ -100,7 +100,8 @@ AutoReqProv:  no
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@l_susr@;%{l_susr};g' \
-        -e 's;@l_sgrp@;%{l_sgrp};g' \
+        -e 's;@l_rusr@;%{l_rusr};g' \
+        -e 's;@l_rgrp@;%{l_rgrp};g' \
         %{SOURCE rc.monit} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     %{l_shtool} mkdir -f -p -m 700 \
@@ -125,7 +126,7 @@ AutoReqProv:  no
         '%config %{l_prefix}/etc/fsl/fsl.%{name}' \
         '%config %attr(0600,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/monit/*' \
         '%dir    %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/monit' \
-        '%dir    %attr(0700,%{l_susr},%{l_mgrp}) %{l_prefix}/var/monit'
+        '%dir    %attr(0770,%{l_musr},%{l_rgrp}) %{l_prefix}/var/monit'
 
 %files -f files
 

+ 1 - 1
monit/rc.monit

@@ -36,7 +36,7 @@
         kill -HUP `cat @l_prefix@/var/monit/monit.pid`
     fi
 
-%daily -u @l_susr@
+%daily -u @l_rusr@
     opServiceEnabled monit || exit 0
 
     #   rotate logfile

+ 2 - 0
nsd/nsd.spec

@@ -137,6 +137,8 @@ AutoReqProv:  no
     %{l_shtool} install -c -m 755 \
         -e 's;@l_prefix@;%{l_prefix};g' \
         -e 's;@l_susr@;%{l_susr};g' \
+        -e 's;@l_rusr@;%{l_rusr};g' \
+        -e 's;@l_rgrp@;%{l_rgrp};g' \
         %{SOURCE rc.nsd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     #   OSSP fake syslog library

+ 1 - 1
nsd/rc.nsd

@@ -26,7 +26,7 @@
         @l_prefix@/sbin/nsdc reload
     fi
 
-%daily -u @l_susr@
+%daily -u @l_rusr@
     opServiceEnabled nsd || exit 0
 
     #   rotate logfile