Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=5b907e81b85ac64ecb3cc7bf5b4f6b629f905de3
commit 5b907e81b85ac64ecb3cc7bf5b4f6b629f905de3 Author: Priyank <priy...@frugalware.org> Date: Mon Jan 26 18:26:33 2009 +0530 postgresql-8.2.11-3-i686 * rc.postgresql: Converted to the new initscript format diff --git a/source/apps-extra/postgresql/FrugalBuild b/source/apps-extra/postgresql/FrugalBuild index 14c1521..d865d18 100644 --- a/source/apps-extra/postgresql/FrugalBuild +++ b/source/apps-extra/postgresql/FrugalBuild @@ -4,7 +4,7 @@ pkgname=postgresql pkgver=8.2.11 -pkgrel=2 +pkgrel=3 pkgdesc="An advanced Object-Relational database management system (DBMS)" url="http://www.postgresql.org/"; depends=('zlib' 'readline') @@ -67,5 +67,5 @@ build() } sha1sums=('5410c25a369f19fc4a376f942351553aff710d8f' \ - 'faa7229726d07a3af32cff8abf8bbb9b46900763') + 'f447d49c76dcf9395ac9210605886fc1fc752575') # optimization OK diff --git a/source/apps-extra/postgresql/messages/postgresql.en b/source/apps-extra/postgresql/messages/postgresql.en deleted file mode 100644 index 05be7a4..0000000 --- a/source/apps-extra/postgresql/messages/postgresql.en +++ /dev/null @@ -1,2 +0,0 @@ -stoppostgresql="Stopping PostgreSQL" -startpostgresql="Starting PostgreSQL" diff --git a/source/apps-extra/postgresql/messages/postgresql.hu b/source/apps-extra/postgresql/messages/postgresql.hu deleted file mode 100644 index 522c462..0000000 --- a/source/apps-extra/postgresql/messages/postgresql.hu +++ /dev/null @@ -1,2 +0,0 @@ -stoppostgresql="A PostgreSQL leállítása" -startpostgresql="A PostgreSQL indítása" diff --git a/source/apps-extra/postgresql/rc.postgresql b/source/apps-extra/postgresql/rc.postgresql index 0028cb2..cf24b3c 100644 --- a/source/apps-extra/postgresql/rc.postgresql +++ b/source/apps-extra/postgresql/rc.postgresql @@ -4,52 +4,64 @@ # rc.postgresql for Frugalware # distributed under GPL License -. /etc/rc.d/rc.functions - # chkconfig: 2345 75 25 # description: Starts and stops the PostgreSQL backend daemon that handles \ # all database requests. +source /lib/initscripts/functions + DATA_DIR="/var/lib/pgsql/data" +daemon=$"PostgreSQL" +actions=(start stop restart status) -if [ "$1" = "stop" ]; then - stop "$stoppostgresql" - if [ -f ${DATA_DIR}/postmaster.pid ]; then - su postgres -c "/usr/bin/pg_ctl -D ${DATA_DIR} \ - -l /var/log/postgresql.log -w -m smart stop" 2>&1 |logger - fi - ok $? -elif [ "$1" = "restart" ]; then - "$0" stop - sleep 1 - "$0" start -else # start - start "$startpostgresql" - # pgdb group - [ `egrep '^pgdb:' /etc/group` ] || groupadd -g 31 pgdb - # postgres user - if [ ! `egrep '^postgres:' /etc/passwd` ]; then - useradd -u 31 -g pgdb -d /var/lib/pgsql -s /bin/bash \ +pid="test -f $DATA_DIR/postmaster.pid && echo running" + + +rc_start() +{ + start_msg + if [ ! -z "$(eval $pid)" ]; then + ok 999 + else + # pgdb group + [ `egrep '^pgdb:' /etc/group` ] || groupadd -g 31 pgdb + # postgres user + if [ ! `egrep '^postgres:' /etc/passwd` ]; then + useradd -u 31 -g pgdb -d /var/lib/pgsql -s /bin/bash \ postgres - [ -d /var/lib/pgsql ] && \ + [ -d /var/lib/pgsql ] && \ chown -R postgres.pgdb /var/lib/pgsql - fi - # create db - if [ ! -d "$DATA_DIR" ]; then - mkdir -p ${DATA_DIR} - chown postgres.pgdb ${DATA_DIR} - su postgres -c "/usr/bin/initdb -D ${DATA_DIR}" \ + fi + # create db + if [ ! -d "$DATA_DIR" ]; then + mkdir -p ${DATA_DIR} + chown postgres.pgdb ${DATA_DIR} + su postgres -c "/usr/bin/initdb -D ${DATA_DIR}" \ 2>&1 |logger - fi - # log - if [ ! -e /var/log/postgresql.log ]; then - touch /var/log/postgresql.log - chown postgres /var/log/postgresql.log - fi - if [ ! -f ${DATA_DIR}/postmaster.pid ]; then - su postgres -c "/usr/bin/pg_ctl -D ${DATA_DIR} \ + fi + # log + if [ ! -e /var/log/postgresql.log ]; then + touch /var/log/postgresql.log + chown postgres /var/log/postgresql.log + fi + su postgres -c "/usr/bin/pg_ctl -D ${DATA_DIR} \ -l /var/log/postgresql.log -w start" 2>&1 |logger + ok $? fi - ok $? -fi +} + +rc_stop() +{ + stop_msg + if [ -n "$(eval $pid)" ]; then + su postgres -c "/usr/bin/pg_ctl -D ${DATA_DIR} \ + -l /var/log/postgresql.log -w -m smart stop" 2>&1 |logger + ok $? + else + ok 999 + fi +} + +rc_exec $1 + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
