From 1cc95518b3216452ce6e460e88aae7548edb9fc3 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 8 Aug 2019 12:16:05 +0200
Subject: Install: fix sql

---
 install.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'install.sh')

diff --git a/install.sh b/install.sh
index d356c77..bc5bc70 100755
--- a/install.sh
+++ b/install.sh
@@ -46,10 +46,13 @@ rm -f /etc/nginx/sites-enabled/commonnet.conf
 ln -s "$PWD"/conf/nginx.conf /etc/nginx/sites-enabled/commonnet.conf
 
 echo " * Checking database $DB_NAME"
-if ! psql -l | grep -qs "$DB_NAME"; then
+if ! su postgres -c "psql -l" | grep -qs "$DB_NAME"; then
   echo "   - not present, creating"
-  createuser --echo --adduser --createdb --encrypted $DB_NAME
-  psql --command "ALTER USER \""$DB_NAME"\" with password '"$PASSWORD"';"
+  su postgres -c "createuser --echo --adduser --createdb --encrypted $DB_NAME"
+  echo "ALTER USER \""$DB_NAME"\" with password '"$PASSWORD"';" > /tmp/inst.sql
+  su postgres -c  "psql -f /tmp/inst.sql"
+  rm /tmp/inst.sql
+  su postgres -c "createdb --echo --owner $DB_NAME --encoding UNICODE $DB_NAME"
 else
   echo "   - already present"
 fi
-- 
cgit v1.2.3