Browse Source

add/unify log file trimming

master
Thomas Lotterer 23 years ago committed by Ralf S. Engelschall
parent
commit
fa14a11801
  1. 2
      arpd/arpd.spec
  2. 15
      arpd/rc.arpd
  3. 2
      honeyd/honeyd.spec
  4. 15
      honeyd/rc.honeyd
  5. 2
      imapd/imapd.spec
  6. 3
      imapd/rc.imapd
  7. 9
      inn/rc.inn
  8. 2
      monit/monit.spec
  9. 9
      monit/rc.monit
  10. 2
      nsd/nsd.spec
  11. 15
      nsd/rc.nsd
  12. 2
      openssh/openssh.spec
  13. 16
      openssh/rc.openssh
  14. 2
      petidomo/petidomo.spec
  15. 22
      petidomo/rc.petidomo
  16. 2
      pks/pks.spec
  17. 15
      pks/rc.pks
  18. 2
      portfwd/portfwd.spec
  19. 15
      portfwd/rc.portfwd
  20. 7
      postfix/rc.postfix
  21. 2
      pound/pound.spec
  22. 15
      pound/rc.pound
  23. 2
      powerdns/powerdns.spec
  24. 15
      powerdns/rc.powerdns
  25. 2
      qpopper/qpopper.spec
  26. 5
      qpopper/rc.qpopper
  27. 15
      sasl/rc.sasl
  28. 2
      sasl/sasl.spec
  29. 45
      sendmail/rc.sendmail
  30. 2
      sendmail/sendmail.spec
  31. 8
      smtpfeed/rc.smtpfeed
  32. 2
      smtpfeed/smtpfeed.spec
  33. 13
      teapop/rc.teapop
  34. 2
      teapop/teapop.spec
  35. 15
      vrrpd/rc.vrrpd
  36. 2
      vrrpd/vrrpd.spec
  37. 15
      whoson/rc.whoson
  38. 2
      whoson/whoson.spec

2
arpd/arpd.spec

@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
Group: Network
License: GNU
Version: 0.2
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

15
arpd/rc.arpd

@ -7,6 +7,11 @@
arpd_enable="yes"
arpd_interface=""
arpd_listen=""
arpd_log_prolog="true"
arpd_log_epilog="true"
arpd_log_numfiles="10"
arpd_log_minsize="1M"
arpd_log_complevel="9"
%start -p 200 -u @l_susr@
opServiceEnabled arpd || exit 0
@ -30,3 +35,13 @@
kill -HUP `cat @l_prefix@/var/arpd/arpd.pid`
fi
%daily -u @l_susr@
opServiceEnabled arpd || exit 0
# rotate logfile
shtool rotate -f \
-n${arpd_log_numfiles} -s${arpd_log_minsize} -d \
-z${arpd_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${arpd_log_prolog}" \
-E "${arpd_log_epilog}" \
@l_prefix@/var/arpd/log/arpd.log

2
honeyd/honeyd.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
Group: Language
License: BSD License
Version: 0.5a
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

15
honeyd/rc.honeyd

@ -5,6 +5,11 @@
%config
honeyd_enable="yes"
honeyd_log_prolog="true"
honeyd_log_epilog="true"
honeyd_log_numfiles="10"
honeyd_log_minsize="1M"
honeyd_log_complevel="9"
%start -p 200 -u @l_susr@
opServiceEnabled honeyd || exit 0
@ -35,3 +40,13 @@
kill -HUP `cat @l_prefix@/var/honeyd/honeyd.pid`
fi
%daily -u @l_susr@
opServiceEnabled honeyd || exit 0
# rotate logfile
shtool rotate -f \
-n${honeyd_log_numfiles} -s${honeyd_log_minsize} -d \
-z${honeyd_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${honeyd_log_prolog}" \
-E "${honeyd_log_epilog}" \
@l_prefix@/var/honeyd/log/honeyd.log

2
imapd/imapd.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
Group: Mail
License: BSD
Version: 2.1.13
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

3
imapd/rc.imapd

@ -42,10 +42,11 @@
%daily -u @l_susr@
opServiceEnabled imapd || exit 0
# rotate logfile
shtool rotate -f \
-n${imapd_log_numfiles} -s${imapd_log_minsize} -d \
-z${imapd_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${imapd_log_prolog}" \
-E "${imapd_log_epilog}" \
@l_prefix@/var/imapd/log/*.log

9
inn/rc.inn

@ -40,7 +40,14 @@
-E "${inn_log_epilog}" \
@l_prefix@/var/inn/log/*.log
# rotate logfile
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/news.*
%quarterly -u @l_rusr@
opServiceEnabled inn || exit 0
opServiceEnabled inn_nntpsend && @l_prefix@/bin/nntpsend || true

2
monit/monit.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
Group: System
License: GPL
Version: 3.2
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

9
monit/rc.monit

@ -38,9 +38,12 @@
%daily -u @l_susr@
opServiceEnabled monit || exit 0
# rotate logfile
shtool rotate -f \
-n${monit_log_numfiles} -s${monit_log_minsize} -d \
-z${monit_log_complevel} -o@l_susr@ -g@l_sgrp@ -m600 \
-z${monit_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${monit_log_prolog}" \
-E "@l_prefix@/etc/rc.d/rc.monit reload; ${monit_log_epilog}" \
@l_prefix@/var/monit/monit.log
-E "${monit_log_epilog}" \
@l_prefix@/var/monit/log/monit.log

2
nsd/nsd.spec

@ -37,7 +37,7 @@ Distribution: OpenPKG [EVAL]
Group: DNS
License: GPL
Version: 1.1.0b
Release: 20030623
Release: 20030624
# package option
%option with_fsl yes

15
nsd/rc.nsd

@ -5,6 +5,11 @@
%config
nsd_enable="yes"
nsd_log_prolog="true"
nsd_log_epilog="true"
nsd_log_numfiles="10"
nsd_log_minsize="1M"
nsd_log_complevel="9"
%start -p 100 -u @l_susr@
if opServiceEnabled nsd; then
@ -21,3 +26,13 @@
@l_prefix@/sbin/nsdc reload
fi
%daily -u @l_susr@
opServiceEnabled nsd || exit 0
# rotate logfile
shtool rotate -f \
-n${nsd_log_numfiles} -s${nsd_log_minsize} -d \
-z${nsd_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${nsd_log_prolog}" \
-E "${nsd_log_epilog}" \
@l_prefix@/var/nsd/log/nsd.log

2
openssh/openssh.spec

@ -38,7 +38,7 @@ Distribution: OpenPKG [CORE]
Group: Security
License: BSD
Version: %{V_base}%{V_portable}
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

16
openssh/rc.openssh

@ -34,6 +34,7 @@
%daily -u @l_susr@
opServiceEnabled openssh || exit 0
opTmpDirGen openssh
opTmpDirFile openssh hint hintfile
prolog="true"
@ -44,13 +45,15 @@
if [ ".$openssh_log_epilog" != . ]; then
epilog="$epilog; $openssh_log_epilog"
fi
# rotate logfile
shtool rotate -f \
-n${openssh_log_numfiles} -s${openssh_log_minsize} \
-d -z${openssh_log_complevel} \
-o@l_musr@ -g@l_mgrp@ -m644 \
-P "$prolog" \
-E "$epilog" \
@l_prefix@/var/openssh/sshd.log
-n${openssh_log_numfiles} -s${openssh_log_minsize} -d \
-z${openssh_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${openssh_log_prolog}" \
-E "${openssh_log_epilog}" \
@l_prefix@/var/openssh/log/sshd.log
if [ ".`cat $hintfile`" = ".epilog" ]; then
openssh_signal TERM
sleep 2
@ -58,3 +61,4 @@
fi
opTmpDirDel openssh

2
petidomo/petidomo.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
Group: Mail
License: GPL
Version: 4.0b1
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

22
petidomo/rc.petidomo

@ -0,0 +1,22 @@
#!@l_prefix@/lib/openpkg/bash @l_prefix@/etc/rc
##
## rc.petidomo -- Run-Commands
##
%config
petidomo_log_prolog="true"
petidomo_log_epilog="true"
petidomo_log_numfiles="10"
petidomo_log_minsize="1M"
petidomo_log_complevel="9"
%daily -u @l_susr@
opServiceEnabled petidomo || exit 0
# rotate logfile
shtool rotate -f \
-n${petidomo_log_numfiles} -s${petidomo_log_minsize} -d \
-z${petidomo_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${petidomo_log_prolog}" \
-E "${petidomo_log_epilog}" \
@l_prefix@/var/petidomo/log/petidomo.log

2
pks/pks.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
Group: Cryptography
License: GPL
Version: 0.9.6
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

15
pks/rc.pks

@ -5,6 +5,11 @@
%config
pks_enable="yes"
pks_log_prolog="true"
pks_log_epilog="true"
pks_log_numfiles="10"
pks_log_minsize="1M"
pks_log_complevel="9"
%start -p 200 -u @l_rusr@
opServiceEnabled pks || exit 0
@ -25,3 +30,13 @@
rm -f @l_prefix@/var/pks/pks-queue-run.pid
fi
%daily -u @l_susr@
opServiceEnabled pks || exit 0
# rotate logfile
shtool rotate -f \
-n${pks_log_numfiles} -s${pks_log_minsize} -d \
-z${pks_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${pks_log_prolog}" \
-E "${pks_log_epilog}" \
@l_prefix@/var/pks/log/pksd.log

2
portfwd/portfwd.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
Group: Network
License: GPL
Version: 0.26rc6
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

15
portfwd/rc.portfwd

@ -6,6 +6,11 @@
%config
portfwd_enable="yes"
portfwd_flags=""
portfwd_log_prolog="true"
portfwd_log_epilog="true"
portfwd_log_numfiles="10"
portfwd_log_minsize="1M"
portfwd_log_complevel="9"
%start -p 100 -u @l_susr@
if opServiceEnabled portfwd; then
@ -17,3 +22,13 @@
rpmtool signal -d 1 -m @l_prefix@/sbin/portfwd TERM KILL >/dev/null 2>&1 || true
fi
%daily -u @l_susr@
opServiceEnabled portfwd || exit 0
# rotate logfile
shtool rotate -f \
-n${portfwd_log_numfiles} -s${portfwd_log_minsize} -d \
-z${portfwd_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${portfwd_log_prolog}" \
-E "${portfwd_log_epilog}" \
@l_prefix@/var/portfwd/log/portfwd.log

7
postfix/rc.postfix

@ -53,8 +53,7 @@
# rotate logfile
shtool rotate -f \
-n${postfix_log_numfiles} -s${postfix_log_minsize} -d \
-z${postfix_log_complevel} -o@l_musr@ -g@l_mgrp@ -m644 \
-P "$postfix_log_prolog" \
-E "@l_prefix@/sbin/postfix reload; $postfix_log_epilog" \
-z${postfix_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${postfix_log_prolog}" \
-E "${postfix_log_epilog}" \
@l_prefix@/var/postfix/log/postfix.log

2
pound/pound.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
Group: Web
License: GPL
Version: 1.4
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

15
pound/rc.pound

@ -5,6 +5,11 @@
%config
pound_enable="yes"
pound_log_prolog="true"
pound_log_epilog="true"
pound_log_numfiles="10"
pound_log_minsize="1M"
pound_log_complevel="9"
%start -p 100 -u @l_susr@
if opServiceEnabled pound; then
@ -17,3 +22,13 @@
sleep 1
fi
%daily -u @l_susr@
opServiceEnabled pound || exit 0
# rotate logfile
shtool rotate -f \
-n${pound_log_numfiles} -s${pound_log_minsize} -d \
-z${pound_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${pound_log_prolog}" \
-E "${pound_log_epilog}" \
@l_prefix@/var/pound/log/pound.log

2
powerdns/powerdns.spec

@ -35,7 +35,7 @@ Distribution: OpenPKG [JUNK]
Group: DNS
License: GPL
Version: 2.9.8
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

15
powerdns/rc.powerdns

@ -5,6 +5,11 @@
%config
powerdns_enable="yes"
powerdns_log_prolog="true"
powerdns_log_epilog="true"
powerdns_log_numfiles="10"
powerdns_log_minsize="1M"
powerdns_log_complevel="9"
%start -p 200 -u @l_susr@
opServiceEnabled powerdns || exit 0
@ -18,3 +23,13 @@
opServiceEnabled powerdns || exit 0
@l_prefix@/bin/pdns_control cycle
%daily -u @l_susr@
opServiceEnabled powerdns || exit 0
# rotate logfile
shtool rotate -f \
-n${powerdns_log_numfiles} -s${powerdns_log_minsize} -d \
-z${powerdns_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${powerdns_log_prolog}" \
-E "${powerdns_log_epilog}" \
@l_prefix@/var/powerdns/log/powerdns.log

2
qpopper/qpopper.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
Group: Mail
License: GPL
Version: 4.0.5
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

5
qpopper/rc.qpopper

@ -36,10 +36,11 @@
%daily -u @l_susr@
opServiceEnabled qpopper || exit 0
# rotate logfile
shtool rotate -f \
-n${qpopper_log_numfiles} -s${qpopper_log_minsize} -d \
-z${qpopper_log_complevel} -o@l_musr@ -g@l_mgrp@ -m644 \
-z${qpopper_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${qpopper_log_prolog}" \
-E "${qpopper_log_epilog}" \
$pop_logfile

15
sasl/rc.sasl

@ -7,6 +7,11 @@
sasl_enable="yes"
sasl_authmech="@l_authmech@"
sasl_threads="2"
sasl_log_prolog="true"
sasl_log_epilog="true"
sasl_log_numfiles="10"
sasl_log_minsize="1M"
sasl_log_complevel="9"
%start -p 200 -u @l_susr@
opServiceEnabled sasl || exit 0
@ -26,3 +31,13 @@
sleep 2
@l_prefix@/sbin/saslauthd -a ${sasl_authmech} -n ${sasl_threads}
%daily -u @l_susr@
opServiceEnabled sasl || exit 0
# rotate logfile
shtool rotate -f \
-n${sasl_log_numfiles} -s${sasl_log_minsize} -d \
-z${sasl_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${sasl_log_prolog}" \
-E "${sasl_log_epilog}" \
@l_prefix@/var/sasl/log/saslauthd.log

2
sasl/sasl.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
Group: Cryptography
License: BSD
Version: 2.1.13
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

45
sendmail/rc.sendmail

@ -35,11 +35,11 @@
sendmail_pidfile_in="@l_prefix@/var/sendmail/sendmail.in.pid"
sendmail_pidfile_out="@l_prefix@/var/sendmail/sendmail.out.pid"
sendmail_pidfile_msp="@l_prefix@/var/sendmail/clientmqueue/sendmail.msp.pid"
sendmail_rotate_prolog=""
sendmail_rotate_epilog=""
sendmail_rotate_numfiles="10"
sendmail_rotate_minsize="1M"
sendmail_rotate_complevel="9"
sendmail_log_prolog="true"
sendmail_log_epilog="true"
sendmail_log_numfiles="10"
sendmail_log_minsize="1M"
sendmail_log_complevel="9"
%common
sendmail_start () {
@ -91,29 +91,14 @@
sendmail_start
%daily -u @l_susr@
if opServiceEnabled sendmail; then
opTmpDirGen sendmail
opTmpDirFile sendmail hint hintfile
prolog="true"
if [ ".$sendmail_rotate_prolog" != . ]; then
prolog="$prolog; $sendmail_rotate_prolog"
fi
epilog="echo 'epilog' >$hintfile"
if [ ".$sendmail_rotate_epilog" != . ]; then
epilog="$epilog; $sendmail_rotate_epilog"
fi
shtool rotate -f \
-n${sendmail_rotate_numfiles} -s${sendmail_rotate_minsize} \
-d -z${sendmail_rotate_complevel} \
-o@l_musr@ -g@l_mgrp@ -m644 \
-P "$prolog" \
-E "$epilog" \
@l_prefix@/var/sendmail/sendmail.log
if [ ".`cat $hintfile`" = ".epilog" ]; then
sendmail_signal TERM KILL
sleep 2
sendmail_start
fi
opTmpDirDel sendmail
fi
opServiceEnabled sendmail || exit 0
# rotate logfile
prolog="$sendmail_log_prolog"
epilog="$sendmail_log_epilog && @l_prefix@/etc/rc sendmail restart || true"
shtool rotate -f \
-n${sendmail_log_numfiles} -s${sendmail_log_minsize} -d \
-z${sendmail_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${prolog}" \
-E "${epilog}" \
@l_prefix@/var/sendmail/sendmail.log

2
sendmail/sendmail.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
Group: Mail
License: BSD
Version: 8.12.9
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

8
smtpfeed/rc.smtpfeed

@ -60,10 +60,12 @@
%daily -u @l_susr@
opServiceEnabled smtpfeed || exit 0
# rotate logfile
shtool rotate -f \
-n${smtpfeed_log_numfiles} -s${smtpfeed_log_minsize} -d \
-z${smtpfeed_log_complevel} -o@l_musr@ -g@l_mgrp@ -m644 \
-P "$smtpfeed_log_prolog" \
-E "$smtpfeed_log_epilog" \
-z${smtpfeed_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${smtpfeed_log_prolog}" \
-E "${smtpfeed_log_epilog}" \
@l_prefix@/var/smtpfeed/smtpfeed.log

2
smtpfeed/smtpfeed.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
Group: Mail
License: GPL
Version: 1.18
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

13
teapop/rc.teapop

@ -35,10 +35,13 @@
%daily -u @l_susr@
opServiceEnabled teapop || exit 0
# rotate logfile
prolog="$teapop_log_prolog"
epilog="$teapop_log_epilog && @l_prefix@/etc/rc teapop restart || true"
shtool rotate -f \
-n${teapop_log_numfiles} -s${teapop_log_minsize} -d \
-z${teapop_log_complevel} -o@l_susr@ -g@l_sgrp@ -m600 \
-P "${teapop_log_prolog}" \
-E "@l_prefix@/etc/rc.d/rc.teapop restart; ${teapop_log_epilog}" \
$pop_logfile
-z${teapop_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${prolog}" \
-E "${epilog}" \
@l_prefix@/var/teapop/log/teapop.log

2
teapop/teapop.spec

@ -35,7 +35,7 @@ Distribution: OpenPKG [PLUS]
Group: Mail
License: BSD
Version: 0.3.5
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

15
vrrpd/rc.vrrpd

@ -5,6 +5,11 @@
%config
vrrpd_enable="yes"
vrrpd_log_prolog="true"
vrrpd_log_epilog="true"
vrrpd_log_numfiles="10"
vrrpd_log_minsize="1M"
vrrpd_log_complevel="9"
%start -p 200 -u @l_susr@
opServiceEnabled vrrpd || exit 0
@ -14,3 +19,13 @@
opServiceEnabled vrrpd || exit 0
/usr/bin/killall vrrpd >/dev/null 2>&1
%daily -u @l_susr@
opServiceEnabled vrrpd || exit 0
# rotate logfile
shtool rotate -f \
-n${vrrpd_log_numfiles} -s${vrrpd_log_minsize} -d \
-z${vrrpd_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${vrrpd_log_prolog}" \
-E "${vrrpd_log_epilog}" \
@l_prefix@/var/vrrpd/log/vrrpd.log

2
vrrpd/vrrpd.spec

@ -35,7 +35,7 @@ Distribution: OpenPKG [JUNK]
Group: Networking
License: BSD
Version: 0.8.7
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

15
whoson/rc.whoson

@ -5,6 +5,11 @@
%config
whoson_enable="yes"
whoson_log_prolog="true"
whoson_log_epilog="true"
whoson_log_numfiles="10"
whoson_log_minsize="1M"
whoson_log_complevel="9"
%common
whoson_pidfile="@l_prefix@/var/whoson/whoson.pid"
@ -27,3 +32,13 @@
rm -f $whoson_pidfile
@l_prefix@/sbin/whosond
%daily -u @l_susr@
opServiceEnabled whoson || exit 0
# rotate logfile
shtool rotate -f \
-n${whoson_log_numfiles} -s${whoson_log_minsize} -d \
-z${whoson_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${whoson_log_prolog}" \
-E "${whoson_log_epilog}" \
@l_prefix@/var/whoson/log/whosond.log

2
whoson/whoson.spec

@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL]
Group: Mail
License: GPL
Version: 2.02a
Release: 20030623
Release: 20030624
# package options
%option with_fsl yes

Loading…
Cancel
Save