# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1459716088 -7200
# Node ID 1cd51c7b72e7345dade28e52ec4b303d7965fc15
# Parent  08577002f5e9e09c94ebef2d871fe2ba0b006314
Use the appropriate system user when initialising database objects.

diff -r 08577002f5e9 -r 1cd51c7b72e7 tools/config.sh
--- a/tools/config.sh	Sun Apr 03 22:39:53 2016 +0200
+++ b/tools/config.sh	Sun Apr 03 22:41:28 2016 +0200
@@ -9,7 +9,8 @@
 
 # Store-specific settings.
 
-# For STORE_TYPE=postgresql:
+# For STORE_TYPE=postgresql...
 
 POSTGRESQL_DB=imip_agent
 POSTGRESQL_USERS="imip-agent www-data"
+AS_POSTGRES="sudo -u postgres"
diff -r 08577002f5e9 -r 1cd51c7b72e7 tools/init.sh
--- a/tools/init.sh	Sun Apr 03 22:39:53 2016 +0200
+++ b/tools/init.sh	Sun Apr 03 22:41:28 2016 +0200
@@ -92,7 +92,7 @@
 
     # Check for the database.
 
-    if psql -tA -c 'select datname from pg_database' postgres | grep -q ^"$POSTGRESQL_DB"$ ; then
+    if $AS_POSTGRES psql -tA -c 'select datname from pg_database' postgres | grep -q ^"$POSTGRESQL_DB"$ ; then
         cat 1>&2 <<EOF
 Database $POSTGRESQL_DB already exists.
 EOF
@@ -101,7 +101,7 @@
 
     # Attempt to create the database.
 
-    if ! createdb "$POSTGRESQL_DB" ; then
+    if ! $AS_POSTGRES createdb "$POSTGRESQL_DB" ; then
         cat 1>&2 <<EOF
 Could not create database $POSTGRESQL_DB using createdb.
 EOF
@@ -110,7 +110,7 @@
 
     # Attempt to initialise the schema.
 
-    if ! psql -f "$SCHEMA" "$POSTGRESQL_DB" ; then
+    if ! $AS_POSTGRES psql -f "$SCHEMA" "$POSTGRESQL_DB" ; then
         cat 1>&2 <<EOF
 Could not initialise schema in database $POSTGRESQL_DB using psql.
 EOF
@@ -121,12 +121,12 @@
     # privileges on the tables.
 
     for USER in $POSTGRESQL_USERS ; do
-        if ! createuser -D -R -S "$USER" ; then
+        if ! $AS_POSTGRES createuser -D -R -S "$USER" ; then
             cat 1>&2 <<EOF
 Could not create database user $USER using createuser.
 EOF
         fi
-        if ! psql -Atc '\dt' "$POSTGRESQL_DB" \
+        if ! $AS_POSTGRES psql -Atc '\dt' "$POSTGRESQL_DB" \
            | cut -d '|' -f 2 \
            | xargs -I{} psql -c "grant all privileges on table {} to \"$USER\"" "$POSTGRESQL_DB" ; then