OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Christoph Schug
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   28-Mar-2003 15:03:17
  Branch: HEAD                             Handle: 2003032814031502

  Modified files:
    openpkg-src/proftpd     proftpd.spec rc.proftpd
    openpkg-web             news.txt

  Log:
    rc script clean up and log file rotation

  Summary:
    Revision    Changes     Path
    1.48        +2  -1      openpkg-src/proftpd/proftpd.spec
    1.4         +55 -4      openpkg-src/proftpd/rc.proftpd
    1.3865      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/proftpd/proftpd.spec
  ============================================================================
  $ cvs diff -u -r1.47 -r1.48 proftpd.spec
  --- openpkg-src/proftpd/proftpd.spec  5 Mar 2003 09:24:57 -0000       1.47
  +++ openpkg-src/proftpd/proftpd.spec  28 Mar 2003 14:03:16 -0000      1.48
  @@ -33,7 +33,7 @@
   Group:        FTP
   License:      GPL
   Version:      1.2.8
  -Release:      20030305
  +Release:      20030328
   
   #   package options
   %option       with_pam  no
  @@ -161,6 +161,7 @@
           $RPM_BUILD_ROOT%{l_prefix}/share/proftpd/.msg.goaway
       %{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_susr@;%{l_susr};g' -e 's;@l_sgrp@;%{l_sgrp};g' \
           %{SOURCE rc.proftpd} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
       #   determine the package ingredients
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/proftpd/rc.proftpd
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 rc.proftpd
  --- openpkg-src/proftpd/rc.proftpd    1 Mar 2002 13:35:04 -0000       1.3
  +++ openpkg-src/proftpd/rc.proftpd    28 Mar 2003 14:03:17 -0000      1.4
  @@ -5,20 +5,44 @@
   
   %config
       proftpd_enable="yes"
  +    proftpd_acc_file="@l_prefix@/var/proftpd/proftpd.access.log"
  +    proftpd_acc_prolog="true"
  +    proftpd_acc_epilog="true"
  +    proftpd_acc_numfiles="10"
  +    proftpd_acc_minsize="1M"
  +    proftpd_acc_complevel="9"
  +    proftpd_auth_file="@l_prefix@/var/proftpd/proftpd.auth.log"
  +    proftpd_auth_prolog="true"
  +    proftpd_auth_epilog="true"
  +    proftpd_auth_numfiles="10"
  +    proftpd_auth_minsize="1M"
  +    proftpd_auth_complevel="9"
  +    proftpd_sys_file="@l_prefix@/var/proftpd/proftpd.system.log"
  +    proftpd_sys_prolog="true"
  +    proftpd_sys_epilog="true"
  +    proftpd_sys_numfiles="10"
  +    proftpd_sys_minsize="1M"
  +    proftpd_sys_complevel="9"
  +    proftpd_xfer_file="@l_prefix@/var/proftpd/proftpd.xfer.log"
  +    proftpd_xfer_prolog="true"
  +    proftpd_xfer_epilog="true"
  +    proftpd_xfer_numfiles="10"
  +    proftpd_xfer_minsize="1M"
  +    proftpd_xfer_complevel="9"
   
  -%start -p 200 -u root
  +%start -p 200 -u @l_susr@
       if opServiceEnabled proftpd; then
           @l_prefix@/sbin/proftpd
       fi
   
  -%stop -p 200 -u root
  +%stop -p 200 -u @l_susr@
       if opServiceEnabled proftpd; then
           if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
               kill -TERM `cat @l_prefix@/var/proftpd/proftpd.pid`
           fi
       fi
   
  -%restart -u root
  +%restart -u @l_susr@
       if opServiceEnabled proftpd; then
           if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
               kill -TERM `cat @l_prefix@/var/proftpd/proftpd.pid`
  @@ -27,10 +51,37 @@
           @l_prefix@/sbin/proftpd
       fi
   
  -%reload -u root
  +%reload -u @l_susr@
       if opServiceEnabled proftpd; then
           if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
               kill -HUP `cat @l_prefix@/var/proftpd/proftpd.pid`
           fi
       fi
  +
  +%daily -u @l_susr@
  +    opServiceEnabled proftpd || exit 0
  +    shtool rotate -f \
  +        -n${proftpd_acc_numfiles} -s${proftpd_acc_minsize} -d \
  +        -z${proftpd_acc_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m600 \
  +        -P "${proftpd_acc_prolog}" \
  +        -E "/cw/etc/rc.d/rc.proftpd restart; ${proftpd_acc_epilog}" \
  +        ${proftpd_acc_file}
  +    shtool rotate -f \
  +        -n${proftpd_auth_numfiles} -s${proftpd_auth_minsize} -d \
  +        -z${proftpd_auth_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m600 \
  +        -P "${proftpd_auth_prolog}" \
  +        -E "/cw/etc/rc.d/rc.proftpd restart; ${proftpd_auth_epilog}" \
  +        ${proftpd_auth_file}
  +    shtool rotate -f \
  +        -n${proftpd_sys_numfiles} -s${proftpd_sys_minsize} -d \
  +        -z${proftpd_sys_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m600 \
  +        -P "${proftpd_sys_prolog}" \
  +        -E "/cw/etc/rc.d/rc.proftpd restart; ${proftpd_sys_epilog}" \
  +        ${proftpd_sys_file}
  +    shtool rotate -f \
  +        -n${proftpd_xfer_numfiles} -s${proftpd_xfer_minsize} -d \
  +        -z${proftpd_xfer_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m600 \
  +        -P "${proftpd_xfer_prolog}" \
  +        -E "/cw/etc/rc.d/rc.proftpd restart; ${proftpd_xfer_epilog}" \
  +        ${proftpd_xfer_file}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3864 -r1.3865 news.txt
  --- openpkg-web/news.txt      28 Mar 2003 13:40:49 -0000      1.3864
  +++ openpkg-web/news.txt      28 Mar 2003 14:03:15 -0000      1.3865
  @@ -1,3 +1,4 @@
  +28-Mar-2003: Upgraded package: P<proftpd-1.2.8-20030328>
   28-Mar-2003: Upgraded package: P<cvs-1.11.5-20030328>
   28-Mar-2003: New package: P<pks-0.9.6-20030328>
   28-Mar-2003: Upgraded package: P<tsmc-5.1.5.14-20030328>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to