mentions all hostnames in usual vars

[myplc.git] / plc.d / postgresql

diff --git a/plc.d/postgresql b/plc.d/postgresql
index de722c8..c16f152 100755 (executable)
--- a/plc.d/postgresql
+++ b/plc.d/postgresql
@@ -7,7 +7,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: postgresql,v 1.4.2.3 2006/08/21 21:21:12 mlhuang Exp $
+# $Id: postgresql,v 1.9 2007/01/19 16:42:08 mlhuang Exp $
 #
 
 # Source function library and configuration
@@ -94,9 +94,11 @@ case "$1" in
        PLC_API_IP=$(gethostbyname $PLC_API_HOST)
        PLC_WWW_IP=$(gethostbyname $PLC_WWW_HOST)
        (
+           echo "host $PLC_DB_NAME $PLC_DB_USER 127.0.0.1/32 password"
            echo "host $PLC_DB_NAME $PLC_DB_USER $PLC_API_IP/32 password"
            echo "host $PLC_DB_NAME $PLC_DB_USER $PLC_WWW_IP/32 password"
            # Drupal also uses PostgreSQL
+           echo "host drupal $PLC_DB_USER 127.0.0.1/32 password"
            echo "host drupal $PLC_DB_USER $PLC_WWW_IP/32 password"
        ) >>$pghba_conf
 
@@ -121,7 +123,7 @@ case "$1" in
 
        # Create the databases if necessary
        if ! psql -U $PLC_DB_USER -c "" $PLC_DB_NAME >/dev/null 2>&1 ; then
-           createdb -U postgres $PLC_DB_NAME
+           createdb -U postgres --encoding=UNICODE --owner=$PLC_DB_USER $PLC_DB_NAME
            psql -U $PLC_DB_USER -f /usr/share/plc_api/$PLC_DB_NAME.sql $PLC_DB_NAME
        fi
        check
@@ -147,7 +149,9 @@ case "$1" in
 
        # Shut down the server
        service postgresql stop
-       check
+
+       # /etc/init.d/postgresql fails if it is not running
+       [ "$PLC_DB_ENABLED" = 1 ] && check
 
        result "$MESSAGE"
        ;;