OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Oct-2005 17:40:05
Branch: HEAD Handle: 2005101216400500
Modified files:
openpkg-src/pgpool pgpool.spec rc.pgpool
Log:
allow the pgpool instances to be manually configured
Summary:
Revision Changes Path
1.2 +1 -1 openpkg-src/pgpool/pgpool.spec
1.2 +17 -4 openpkg-src/pgpool/rc.pgpool
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/pgpool/pgpool.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 pgpool.spec
--- openpkg-src/pgpool/pgpool.spec 11 Oct 2005 06:51:25 -0000 1.1
+++ openpkg-src/pgpool/pgpool.spec 12 Oct 2005 15:40:05 -0000 1.2
@@ -33,7 +33,7 @@
Group: Database
License: GPL
Version: 2.6.3
-Release: 20051011
+Release: 20051012
# list of sources
Source0:
http://pgfoundry.org/frs/download.php/426/pgpool-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/pgpool/rc.pgpool
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.pgpool
--- openpkg-src/pgpool/rc.pgpool 11 Oct 2005 06:51:25 -0000 1.1
+++ openpkg-src/pgpool/rc.pgpool 12 Oct 2005 15:40:05 -0000 1.2
@@ -5,6 +5,7 @@
%config
pgpool_enable="$openpkg_rc_def"
+ pgpool_instances="default"
pgpool_log_prolog="true"
pgpool_log_epilog="true"
pgpool_log_numfiles="10"
@@ -17,12 +18,24 @@
pgpool_signal () {
[ -f $pgpool_vardir/$1.pid ] && kill -$2 `cat $pgpool_vardir/$1.pid`
}
+ pgpool_cfgfiles () {
+ for instance in $pgpool_instances; do
+ cfgfile=`echo "$instance" |\
+ sed -e 's;^;X;' \
+ -e 's;Xdefault$;pgpool;' \
+ -e 's;X\(.*\)$;pgpool-\1;' \
+ -e 's;$;.conf;'`
+ if [ -f "$pgpool_etcdir/$cfgfile" ]; then
+ echo "$pgpool_etcdir/$cfgfile"
+ fi
+ done
+ }
%status -u @l_nusr@ -o
pgpool_usable="unknown"
pgpool_active="yes"
if rcService pgpool enable yes; then
- for cfgfile in $pgpool_etcdir/*.conf; do
+ for cfgfile in `pgpool_cfgfiles`; do
name=`echo "$cfgfile" | sed -e 's;^.*/\([^/]*\)$;\1;' -e
's;\.conf$;;'`
pgpool_signal $name 0
if [ $? -ne 0 ]; then
@@ -38,14 +51,14 @@
%start -p 200 -u @l_nusr@
rcService pgpool enable yes || exit 0
rcService pgpool active yes && exit 0
- for cfgfile in $pgpool_etcdir/*.conf; do
+ for cfgfile in `pgpool_cfgfiles`; do
@l_prefix@/sbin/pgpool -f $cfgfile
done
%stop -p 800 -u @l_nusr@
rcService pgpool enable yes || exit 0
rcService pgpool active no && exit 0
- for cfgfile in $pgpool_etcdir/*.conf; do
+ for cfgfile in `pgpool_cfgfiles`; do
@l_prefix@/sbin/pgpool -f $cfgfile stop
done
@@ -56,7 +69,7 @@
%daily -u @l_nusr@
rcService pgpool enable yes || exit 0
- for cfgfile in $pgpool_etcdir/*.conf; do
+ for cfgfile in `pgpool_cfgfiles`; do
name=`echo "$cfgfile" | sed -e 's;^.*/\([^/]*\)$;\1;' -e
's;\.conf$;;'`
shtool rotate -f \
-n ${pgpool_log_numfiles} -s ${pgpool_log_minsize} -d \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
