# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1459712615 -7200
# Node ID fd4ecfe8b0a5dc247eae5aa5eeb3a6131ab52b71
# Parent  ac93d058c7468b7985059f9567e823119d4444c5
Removed command line overrides; added database, user and schema initialisation.
Updated the installation script to install schema details.

diff -r ac93d058c746 -r fd4ecfe8b0a5 tools/config.sh
--- a/tools/config.sh	Sun Apr 03 21:41:44 2016 +0200
+++ b/tools/config.sh	Sun Apr 03 21:43:35 2016 +0200
@@ -6,3 +6,10 @@
 INSTALL_DIR=/var/lib/imip-agent
 WEB_INSTALL_DIR=/var/www/imip-agent
 CONFIG_DIR=/etc/imip-agent
+
+# Store-specific settings.
+
+# For STORE_TYPE=postgresql:
+
+POSTGRESQL_DB=imip_agent
+POSTGRESQL_USERS="imip-agent www-data"
diff -r ac93d058c746 -r fd4ecfe8b0a5 tools/fix.sh
--- a/tools/fix.sh	Sun Apr 03 21:41:44 2016 +0200
+++ b/tools/fix.sh	Sun Apr 03 21:43:35 2016 +0200
@@ -14,36 +14,34 @@
 
 if [ "$1" = "--help" ]; then
     cat 1>&2 <<EOF
-Usage: $PROGNAME [ <stored data directory> [ <published data directory> [ <user> [ <group> ] ] ] ]
+Usage: $PROGNAME
+
+Fix permissions for the stored and published data directories, operating on...
 
-Fix permissions for the stored and published data directories, operating on the
-given stored data and published data directories (or, respectively,
-$INSTALL_DIR and $WEB_INSTALL_DIR if omitted).
+  * $INSTALL_DIR
+  * $WEB_INSTALL_DIR
 
-Set ownership and membership using the given user and group (or, respectively,
-$IMIP_AGENT_USER and $IMIP_AGENT_GROUP if omitted).
+...respectively.
+
+Set ownership and membership to the user and group respectively given as
+$IMIP_AGENT_USER and $IMIP_AGENT_GROUP.
 EOF
     exit 1
 fi
 
-INSTALL_DIR=${1:-$INSTALL_DIR}
-WEB_INSTALL_DIR=${2:-$WEB_INSTALL_DIR}
-USER=${3:-$IMIP_AGENT_USER}
-GROUP=${4:-$IMIP_AGENT_GROUP}
-
-chown -R "$USER" "$INSTALL_DIR"
-chgrp -R "$GROUP" "$INSTALL_DIR"
+chown -R "$IMIP_AGENT_USER" "$INSTALL_DIR"
+chgrp -R "$IMIP_AGENT_GROUP" "$INSTALL_DIR"
 
 for DIR in "$INSTALL_DIR"/preferences "$WEB_INSTALL_DIR"/static ; do
-    chown -R "$USER" "$DIR"
-    chgrp -R "$GROUP" "$DIR"
+    chown -R "$IMIP_AGENT_USER" "$DIR"
+    chgrp -R "$IMIP_AGENT_GROUP" "$DIR"
     chmod -R g+w "$DIR"
 done
 
 if [ "$STORE_TYPE" = "file" ]; then
     for DIR in "$INSTALL_DIR"/store "$INSTALL_DIR"/journal ; do
-        chown -R "$USER" "$DIR"
-        chgrp -R "$GROUP" "$DIR"
+        chown -R "$IMIP_AGENT_USER" "$DIR"
+        chgrp -R "$IMIP_AGENT_GROUP" "$DIR"
         chmod -R g+w "$DIR"
     done
 fi
diff -r ac93d058c746 -r fd4ecfe8b0a5 tools/init.sh
--- a/tools/init.sh	Sun Apr 03 21:41:44 2016 +0200
+++ b/tools/init.sh	Sun Apr 03 21:43:35 2016 +0200
@@ -1,61 +1,139 @@
 #!/bin/sh
 
 DIRNAME=`dirname $0`
+CONFIG="$DIRNAME/config.sh"
 
-if [ -e "$DIRNAME/config.sh" ]; then
-    CONFIG="$DIRNAME/config.sh"
+if [ -e "$CONFIG" ]; then
     . "$CONFIG"
 else
     CONFIG=/etc/imip-agent/config.sh
     . "$CONFIG"
 fi
 
+SCHEMA="$DIRNAME/../conf/postgresql/schema.sql"
+
+if [ ! -e "$SCHEMA" ]; then
+    SCHEMA=/etc/imip-agent/postgresql/schema.sql
+fi
+
 PROGNAME=`basename $0`
 
 if [ "$1" = "--help" ]; then
     cat 1>&2 <<EOF
-Usage: $PROGNAME [ <stored data directory> [ <published data directory> [ <user> [ <group> ] ] ] ]
+Usage: $PROGNAME
+
+Initialise stored and published data directories at...
 
-Initialise stored and published data directories either at any specified
-locations or, respectively, at $INSTALL_DIR and $WEB_INSTALL_DIR.
+  * $INSTALL_DIR
+  * $WEB_INSTALL_DIR
 
-Set permissions to the given user and group or, respectively, to $IMIP_AGENT_USER
+...respectively.
+
+Set permissions to the user and group respectively given as $IMIP_AGENT_USER
 and $IMIP_AGENT_GROUP.
 
-Within the stored data directory (using $INSTALL_DIR as an example), the
-following directories are created:
+Within the stored data directory, the following directories will be created
+(with STORE_TYPE currently set as "$STORE_TYPE"):
 
-  * $INSTALL_DIR/journal (if STORE_TYPE is "file")
   * $INSTALL_DIR/preferences
-  * $INSTALL_DIR/store (if STORE_TYPE is "file")
+EOF
 
-Within the published data directory (using $WEB_INSTALL_DIR as an example), the
-following directory is created:
+    if [ "$STORE_TYPE" = "file" ]; then
+        cat 1>&2 <<EOF
+  * $INSTALL_DIR/journal (if STORE_TYPE is "file")
+  * $INSTALL_DIR/store (if STORE_TYPE is "file")
+EOF
+    fi
+
+    cat 1>&2 <<EOF
+
+Within the published data directory the following directory will be created:
 
   * $WEB_INSTALL_DIR/static
+EOF
 
-See $CONFIG for the STORE_TYPE setting.
+    if [ "$STORE_TYPE" = "postgresql" ]; then
+        cat 1>&2 <<EOF
+
+With STORE_TYPE set as "database", a database schema will be initialised for the
+following database:
+
+  * $POSTGRESQL_DB
+EOF
+    fi
+
+    cat 1>&2 <<EOF
+
+See $CONFIG for the settings used as described above.
 EOF
     exit 1
 fi
 
-INSTALL_DIR=${1:-$INSTALL_DIR}
-WEB_INSTALL_DIR=${2:-$WEB_INSTALL_DIR}
-USER=${3:-$IMIP_AGENT_USER}
-GROUP=${4:-$IMIP_AGENT_GROUP}
-
 for DIR in "$INSTALL_DIR"/preferences "$WEB_INSTALL_DIR"/static ; do
     mkdir -p "$DIR"
-    chown "$USER" "$DIR"
-    chgrp "$GROUP" "$DIR"
+    chown "$IMIP_AGENT_USER" "$DIR"
+    chgrp "$IMIP_AGENT_GROUP" "$DIR"
     chmod g+ws "$DIR"
 done
 
+# Initialise a file store.
+
 if [ "$STORE_TYPE" = "file" ]; then
     for DIR in "$INSTALL_DIR"/store "$INSTALL_DIR"/journal ; do
         mkdir -p "$DIR"
-        chown "$USER" "$DIR"
-        chgrp "$GROUP" "$DIR"
+        chown "$IMIP_AGENT_USER" "$DIR"
+        chgrp "$IMIP_AGENT_GROUP" "$DIR"
         chmod g+ws "$DIR"
     done
+
+# Initialise a PostgreSQL store.
+
+elif [ "$STORE_TYPE" = "postgresql" ]; then
+
+    # Check for the database.
+
+    if psql -tA -c 'select datname from pg_database' postgres | grep -q ^"$POSTGRESQL_DB"$ ; then
+        cat 1>&2 <<EOF
+Database $POSTGRESQL_DB already exists.
+EOF
+        exit 1
+    fi
+
+    # Attempt to create the database.
+
+    if ! createdb "$POSTGRESQL_DB" ; then
+        cat 1>&2 <<EOF
+Could not create database $POSTGRESQL_DB using createdb.
+EOF
+        exit 1
+    fi
+
+    # Attempt to initialise the schema.
+
+    if ! psql -f "$SCHEMA" "$POSTGRESQL_DB" ; then
+        cat 1>&2 <<EOF
+Could not initialise schema in database $POSTGRESQL_DB using psql.
+EOF
+        exit 1
+    fi
+
+    # For each user needing to connect, attempt to create a role and grant it
+    # privileges on the tables.
+
+    for USER in $POSTGRESQL_USERS ; do
+        if ! 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" \
+           | cut -d '|' -f 2 \
+           | xargs -I{} psql -c "grant all privileges on table {} to \"$USER\"" "$POSTGRESQL_DB" ; then
+
+            cat 1>&2 <<EOF
+Could not grant permissions for schema in database $POSTGRESQL_DB to $USER
+using psql.
+EOF
+        fi
+    done
 fi
diff -r ac93d058c746 -r fd4ecfe8b0a5 tools/init_user.sh
--- a/tools/init_user.sh	Sun Apr 03 21:41:44 2016 +0200
+++ b/tools/init_user.sh	Sun Apr 03 21:43:35 2016 +0200
@@ -14,26 +14,37 @@
 
 if [ "$1" = "--help" ]; then
     cat 1>&2 <<EOF
-Usage: $PROGNAME <calendar user> [ <stored data directory> [ <published data directory> [ <user> ] ] ]
+Usage: $PROGNAME <calendar user>
 
 Initialise a given calendar user within an existing installation, creating
-resources within the given stored data and published data directories or,
-respectively, within $INSTALL_DIR and $WEB_INSTALL_DIR.
+resources within the given stored data and published data directories...
+
+  * $INSTALL_DIR
+  * $WEB_INSTALL_DIR
 
-The resources will be defined as having the given system user as owner or,
-if the user is omitted, the $IMIP_AGENT_USER as owner.
+...respectively.
+
+The resources will be defined as having $IMIP_AGENT_USER as owner.
+
+See $CONFIG for the settings used as described above.
 EOF
     exit 1
 fi
 
 CALENDAR_USER=$1
-INSTALL_DIR=${2:-$INSTALL_DIR}
-WEB_INSTALL_DIR=${3:-$WEB_INSTALL_DIR}
-USER=${4:-$IMIP_AGENT_USER}
+
+if [ ! "$CALENDAR_USER" ]; then
+    cat 1>&2 <<EOF
+Need a calendar user to initialise.
+EOF
+    exit 1
+fi
+
+# Initialise the directories.
 
 for DIR in "$INSTALL_DIR"/preferences "$WEB_INSTALL_DIR"/static ; do
     mkdir -p "$DIR/$CALENDAR_USER"
-    chown "$USER" "$DIR/$CALENDAR_USER"
+    chown "$IMIP_AGENT_USER" "$DIR/$CALENDAR_USER"
     chmod g+ws "$DIR/$CALENDAR_USER"
     # Group privileges should already be set.
 done
@@ -41,7 +52,7 @@
 if [ "$STORE_TYPE" = "file" ]; then
     for DIR in "$INSTALL_DIR"/store "$INSTALL_DIR"/journal ; do
         mkdir -p "$DIR/$CALENDAR_USER"
-        chown "$USER" "$DIR/$CALENDAR_USER"
+        chown "$IMIP_AGENT_USER" "$DIR/$CALENDAR_USER"
         chmod g+ws "$DIR/$CALENDAR_USER"
         # Group privileges should already be set.
     done
diff -r ac93d058c746 -r fd4ecfe8b0a5 tools/install.sh
--- a/tools/install.sh	Sun Apr 03 21:41:44 2016 +0200
+++ b/tools/install.sh	Sun Apr 03 21:43:35 2016 +0200
@@ -87,6 +87,14 @@
 
 cp tools/config.sh "$CONFIG_DIR/"
 
+# Copy related configuration files.
+
+if [ ! -e "$CONFIG_DIR/postgresql" ]; then
+    mkdir -p "$CONFIG_DIR/postgresql"
+fi
+
+cp conf/postgresql/schema.sql "$CONFIG_DIR/postgresql/"
+
 # Tools
 
 TOOLS="fix.sh init.sh init_user.sh make_freebusy.py set_quota_limit.py update_quotas.py update_scheduling_modules.py"