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

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   29-Aug-2003 16:54:14
  Branch: HEAD                             Handle: 2003082915541202

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

  Log:
    Treat log files separately during daily ops

  Summary:
    Revision    Changes     Path
    1.76        +1  -1      openpkg-src/mysql/mysql.spec
    1.18        +44 -16     openpkg-src/mysql/rc.mysql
    1.6329      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/mysql/mysql.spec
  ============================================================================
  $ cvs diff -u -r1.75 -r1.76 mysql.spec
  --- openpkg-src/mysql/mysql.spec      5 Aug 2003 13:28:02 -0000       1.75
  +++ openpkg-src/mysql/mysql.spec      29 Aug 2003 14:54:14 -0000      1.76
  @@ -39,7 +39,7 @@
   Group:        Database
   License:      GPL
   Version:      %{V_opkg}
  -Release:      20030805
  +Release:      20030829
   
   #   package options
   %option       with_berkeleydb  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mysql/rc.mysql
  ============================================================================
  $ cvs diff -u -r1.17 -r1.18 rc.mysql
  --- openpkg-src/mysql/rc.mysql        23 Jul 2003 20:27:09 -0000      1.17
  +++ openpkg-src/mysql/rc.mysql        29 Aug 2003 14:54:14 -0000      1.18
  @@ -7,18 +7,28 @@
       mysql_enable="$openpkg_rc_def"
       [EMAIL PROTECTED]@/etc/mysql/my.pwd
       [EMAIL PROTECTED]@/etc/mysql/my.cnf
  -    mysql_log_prolog="true"
  -    mysql_log_epilog="true"
  -    mysql_log_numfiles="10"
  -    mysql_log_minsize="1M"
  -    mysql_log_complevel="9"
  +    mysql_common_prolog="true"
  +    mysql_common_epilog="true"
  +    mysql_common_numfiles="10"
  +    mysql_common_minsize="1M"
  +    mysql_common_complevel="9"
  +    mysql_update_prolog="true"
  +    mysql_update_epilog="true"
  +    mysql_update_numfiles="10"
  +    mysql_update_minsize="1M"
  +    mysql_update_complevel="9"
  +    mysql_err_prolog="true"
  +    mysql_err_epilog="true"
  +    mysql_err_numfiles="10"
  +    mysql_err_minsize="1M"
  +    mysql_err_complevel="9"
   
   %common
       #   same paths as in my.cnf
       [EMAIL PROTECTED]@/var/mysql/mysqld.pid
  -    [EMAIL PROTECTED]@/var/mysql/mysqld.err
  -    [EMAIL PROTECTED]@/var/mysql/common.log
  -    [EMAIL PROTECTED]@/var/mysql/update.log
  +    [EMAIL PROTECTED]@/var/mysql/mysqld.err
  +    [EMAIL PROTECTED]@/var/mysql/common.log
  +    [EMAIL PROTECTED]@/var/mysql/update.log
   
   %status -u @l_rusr@ -o
       mysql_usable="unknown"
  @@ -57,14 +67,32 @@
   %daily -u @l_rusr@
       rcService mysql enable yes || exit 0
   
  -    #   rotate logfile
  +    #   rotate logfiles
  +    rcTmp -i
  +    hintfile=`rcTmp -f -n hint`
       shtool rotate -f \
  -        -n ${mysql_log_numfiles} -s ${mysql_log_minsize} -d \
  -        -z ${mysql_log_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
  -        -P "${mysql_log_prolog}" \
  -        -E "$mysql_log_epilog && @l_prefix@/bin/mysqladmin \
  +        -n ${mysql_common_numfiles} -s ${mysql_common_minsize} -d \
  +        -z ${mysql_common_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
  +        -P "${mysql_common_prolog}" \
  +        -E "${mysql_common_epilog} && @l_prefix@/bin/mysqladmin \
               --defaults-extra-file=${mysql_pwd_file} flush-logs" \
  -        ${mysql_log_common} \
  -        ${mysql_log_update} \
  -        ${mysql_log_err}
  +        ${mysql_common_log}
  +    shtool rotate -f \
  +        -n ${mysql_update_numfiles} -s ${mysql_update_minsize} -d \
  +        -z ${mysql_update_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
  +        -P "${mysql_update_prolog}" \
  +        -E "${mysql_update_epilog} && @l_prefix@/bin/mysqladmin \
  +            --defaults-extra-file=${mysql_pwd_file} flush-logs" \
  +        ${mysql_update_log}
  +    shtool rotate -f \
  +        -n ${mysql_err_numfiles} -s ${mysql_err_minsize} -d \
  +        -z ${mysql_err_complevel} -m 660 -o @l_rusr@ -g @l_rgrp@ \
  +        -P "${mysql_err_prolog}" \
  +        -E "${mysql_err_epilog} && @l_prefix@/bin/mysqladmin \
  +            --defaults-extra-file=${mysql_pwd_file} flush-logs" \
  +        ${mysql_err_log}
  +    if [ -s $hintfile ]; then
  +        rc mysql restart
  +    fi
  +    rcTmp -k
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.6328 -r1.6329 news.txt
  --- openpkg-web/news.txt      29 Aug 2003 11:36:39 -0000      1.6328
  +++ openpkg-web/news.txt      29 Aug 2003 14:54:12 -0000      1.6329
  @@ -1,3 +1,4 @@
  +29-Aug-2003: Upgraded package: P<mysql-4.0.14-20030829>
   29-Aug-2003: Upgraded package: P<mico-2.3.10-20030829>
   29-Aug-2003: Upgraded package: P<amavisd-20030616p5-20030829>
   29-Aug-2003: Upgraded package: P<nntpcache-3.0.1-1.20030829>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to