- adapterized, remaining pl translations, BuildRequires: automake

[packages/postgresql.git] / postgresql.init

diff --git a/postgresql.init b/postgresql.init
index 391357d35407476b0bf173579a7710dc58d785bc..75f7b6f233faa94e2a41ced26aed2521586f9fa1 100644 (file)
--- a/postgresql.init
+++ b/postgresql.init
@@ -32,6 +32,21 @@ if is_no "${NETWORKING}"; then
        exit 1
 fi
 
+# check if postmaster is realy alive
+if [ -f /var/lib/pgsql/postmaster.pid ]; then
+ if ps -p `head -1 /var/lib/pgsql/postmaster.pid` > /dev/null ; then
+        #ok. it's alive
+       echo > /dev/null;
+ else
+        # oh, it has crashed
+        rm -f  /var/lock/subsys/postgresql
+ fi
+else
+       # it's stoped. 
+       rm -f  /var/lock/subsys/postgresql
+fi
+
+
 # See how we were called.
 case "$1" in
   start)
@@ -43,9 +58,9 @@ case "$1" in
                [ -f /tmp/.s.PGSQL.5432 ] || rm -f /tmp/.s.PGSQL.5432
                
                # Check for the PGDATA structure
-               if [ -f $POSTGRES_DATA_DIR/PG_VERSION ] && [ -d $POSTGRES_DATA_DIR/base/template1 ]; then
+               if [ -f $POSTGRES_DATA_DIR/PG_VERSION ] && [ -f $POSTGRES_DATA_DIR/global/pg_control ]; then
                    # Check version of existing PGDATA
-                   if [ `cat $POSTGRES_DATA_DIR/PG_VERSION` != '7.0' ]; then
+                   if [ `cat $POSTGRES_DATA_DIR/PG_VERSION` != '7.1' ]; then
                        show "Databases created under incompatibile version. Migrate them first."; fail
                        exit 1
                    fi
@@ -54,20 +69,27 @@ case "$1" in
                    if [ ! -d $POSTGRES_DATA_DIR ]; then
                        mkdir -p $POSTGRES_DATA_DIR
                        chown postgres.postgres $POSTGRES_DATA_DIR
+                       chmod 700 $POSTGRES_DATA_DIR
                    fi
-                   su postgres -c "LD_LIBRARY_PATH=/usr/lib \
+                   TMPDIR=/tmp su postgres -c "LD_LIBRARY_PATH=/usr/lib \
                        initdb --pgdata=$POSTGRES_DATA_DIR \
-                       --pglib=/usr/lib/pgsql"
+                       -L /usr/share/postgresql"
                fi
                
                msg_starting PostgreSQL 
                busy
-               PGSQL_CMDLINE="$([ "$ALLOW_TCP_CONNECTIONS" = yes ] && echo "-i") \
-                   $([ -n "$MAX_NUM_BACKENDS" ] && echo "-N $MAX_NUM_BACKENDS") \
-                   $([ -n "$POSTGRES_DATA_DIR" ] && echo "-D $POSTGRES_DATA_DIR") \
-                   $([ "$POSTGRES_QUIET". = yes. ] && echo '-o -Q') \
-                   $([ "$POSTGRES_DISABLE_FSYNC". = yes. ] && echo '-o -F')";
-               su postgres -c "/usr/bin/postmaster $PGSQL_CMDLINE >>$POSTGRES_LOG 2>&1 &"
+               PGSQL_CMDLINE="$([ -n "$POSTGRES_DATA_DIR" ] && echo "-D $POSTGRES_DATA_DIR") \
+                   $([ "$POSTGRES_QUIET". = yes. ] && echo '-s')";
+               POSTMASTER_OPTIONS=" \
+                   $([ "$POSTGRES_QUIET". = yes. ] && echo '-S') \
+                   $([ "$POSTGRES_DISABLE_FSYNC". = yes. ] && echo '-F') \
+                   $([ "$ALLOW_TCP_CONNECTIONS". = yes. ] && echo '-i')";
+
+               TMPDIR=/tmp su postgres -c "\
+                       $(echo "/usr/bin/pg_ctl start $PGSQL_CMDLINE -l $POSTGRES_LOG") \
+                       $([ "$POSTMASTER_OPTIONS". != . ] && echo "-o '$POSTMASTER_OPTIONS'") \
+                       $(echo "2>&1 >/dev/null")";
+
                out=`status postmaster`
                if [ $? -eq 0 ]; then 
                    deltext; ok
@@ -79,29 +101,63 @@ case "$1" in
        touch /var/lock/subsys/postgresql
        ;;
   stop)
+
        if [ ! -f /var/lock/subsys/postgresql ]; then
                msg_Not_Running PostgreSQL
                exit 0  
        fi
        msg_stopping postgreSQL
-       killproc postmaster
+       busy
+       PGSQL_CMDLINE="$([ -n "$POSTGRES_DATA_DIR" ] && echo "-D $POSTGRES_DATA_DIR")";
+       TMPDIR=/tmp su postgres -c "/usr/bin/pg_ctl stop $PGSQL_CMDLINE -m fast 2>&1 >/dev/null"
        out=`status postmaster`
-       if [ $? -eq 0 ]; then 
-           deltext; fail 
-           echo -e "\n$out";
-           exit 1      
+       if [ $? -eq 0 ]; then
+               deltext; fail
+               echo -e "\n$out";
+               exit 1
+       else
+               deltext; ok
        fi
-       
        rm -f /var/run/postmaster.pid
        rm -f /var/lock/subsys/postgresql
        ;;
   status)
-       status postmaster
+       PGSQL_CMDLINE="$([ -n "$POSTGRES_DATA_DIR" ] && echo "-D $POSTGRES_DATA_DIR")";
+       TMPDIR=/tmp su postgres -c "/usr/bin/pg_ctl status $PGSQL_CMDLINE"
        ;;
-  restart|reload)
-       $0 stop
+  restart)
+       $0 stop
        $0 start
        ;;
+  reload)
+       if [ ! -f /var/lock/subsys/postgresql ]; then
+               msg_Not_Running PostgreSQL
+               exit 0  
+       fi
+       msg_reloading postgreSQL
+       busy
+
+       PGSQL_CMDLINE="$([ -n "$POSTGRES_DATA_DIR" ] && echo "-D $POSTGRES_DATA_DIR") \
+           $([ "$POSTGRES_QUIET". = yes. ] && echo '-s')";
+       POSTMASTER_OPTIONS=" \
+           $([ "$POSTGRES_QUIET". = yes. ] && echo '-S') \
+           $([ "$POSTGRES_DISABLE_FSYNC". = yes. ] && echo '-F') \
+           $([ "$ALLOW_TCP_CONNECTIONS". = yes. ] && echo '-i')";
+
+       TMPDIR=/tmp su postgres -c "\
+               $(echo "/usr/bin/pg_ctl restart $PGSQL_CMDLINE -l $POSTGRES_LOG") \
+               $([ "$POSTMASTER_OPTIONS". != . ] && echo "-o '$POSTMASTER_OPTIONS'") \
+               $(echo "2>&1 >/dev/null")";
+
+       out=`status postmaster`
+       if [ $? -eq 0 ]; then
+               deltext; ok
+       else
+               deltext; fail
+               echo -e "\n$out";
+               exit 1
+       fi
+       ;;
   *)
        msg_Usage "$0 {start|stop|status|restart|reload}"
        exit 1