From 658c76a01e6ee7fba62e0299da01638b268c70a7 Mon Sep 17 00:00:00 2001
From: clinton_admin <clinton_admin@deleuze.hcoop.net>
Date: Thu, 10 Mar 2011 19:42:18 -0500
Subject: [PATCH] create-user: Database creation fixes * Invoke
 `create-user-database' as root * Do not attempt to create directories or
 tablespaces if they already   exist

---
 create-user          |  2 +-
 create-user-database | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/create-user b/create-user
index 39fa7ab..244b6f8 100755
--- a/create-user
+++ b/create-user
@@ -262,7 +262,7 @@ else
 fi
 
 # Create database tablespaces
-execute_on_fritz /afs/hcoop.net/common/etc/scripts/create-user-database $USER
+execute_on_fritz sudo /afs/hcoop.net/common/etc/scripts/create-user-database $USER
 
 #
 # Mount points for backup volumes
diff --git a/create-user-database b/create-user-database
index 99293b0..cf855c4 100755
--- a/create-user-database
+++ b/create-user-database
@@ -11,13 +11,17 @@ PGDIR=$DBPATH/postgres
 MYSQLDIR=$DBPATH/mysql
 
 # Create postgres user and tablespace placeholder within volume
+# FIXME: This assumes the status-quo of database accounts not being
+# removed by destroy-user...
 if ! test -d $PGDIR; then
   mkdir -p $PGDIR
   chown postgres:postgres $PGDIR
+  sudo -u postgres psql -c "CREATE TABLESPACE user_$USER OWNER postgres LOCATION '$PGDIR'" template1
 fi
 
-sudo -u postgres psql -c "CREATE TABLESPACE user_$USER OWNER postgres LOCATION '$PGDIR'" template1
-
 # Create mysql user and databases placeholder within volume
-mkdir -p $MYSQLDIR
-chown mysql:mysql $MYSQLDIR
\ No newline at end of file
+# FIXME: Same as postgres...
+if ! test -d $MYSQLDIR; then
+    mkdir -p $MYSQLDIR
+    chown mysql:mysql $MYSQLDIR
+fi
\ No newline at end of file
-- 
2.20.1