Clean postgres driver variables and add postgres-9.1 support

[hcoop/domtool2.git] / src / plugins / domtool-postgres

diff --git a/src/plugins/domtool-postgres b/src/plugins/domtool-postgres
index fed7bbe..03320d0 100755 (executable)
--- a/src/plugins/domtool-postgres
+++ b/src/plugins/domtool-postgres
@@ -1,27 +1,34 @@
 #!/bin/sh -e
 
+export PGPORT="$2"
+
 case $1 in
        adduser)
-               USERNAME=$2
+               USERNAME=$3
 
-               sudo -u postgres psql -c "CREATE USER $USERNAME" template1
-               sudo -u postgres psql -c "ALTER TABLESPACE user_$USERNAME OWNER TO $USERNAME"
+               sudo -u postgres psql -h postgres -c "CREATE USER $USERNAME" template1
+               sudo -u postgres psql -h postgres -c "ALTER TABLESPACE user_$USERNAME OWNER TO $USERNAME"
        ;;
 
        createdb)
-               USERNAME=$2
-               DBNAME_BASE=$3
+               USERNAME=$3
+               DBNAME_BASE=$4
+               ENCODING=$5
                DBNAME="${USERNAME}_${DBNAME_BASE}"
 
-               sudo -u postgres createdb -O $USERNAME -D user_$USERNAME $DBNAME
+               if [ -n "$ENCODING" ]; then
+                   ENCODING="-E $ENCODING"
+               fi
+
+               sudo -u postgres createdb -h postgres -O $USERNAME -D user_$USERNAME $ENCODING $DBNAME
        ;;
 
        dropdb)
-               USERNAME=$2
-               DBNAME_BASE=$3
+               USERNAME=$3
+               DBNAME_BASE=$4
                DBNAME="${USERNAME}_${DBNAME_BASE}"
 
-               sudo -u postgres dropdb $DBNAME
+               sudo -u postgres dropdb -h postgres $DBNAME
        ;;
 
        *)