From d122dcacc3f7d95124f30ee988cebb0873befa34 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 8 Aug 2019 12:52:22 +0200
Subject: Install: ALLOWED_HOSTS

---
 install.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'install.sh')

diff --git a/install.sh b/install.sh
index 8fd48b9..70ee7a6 100755
--- a/install.sh
+++ b/install.sh
@@ -35,7 +35,7 @@ mkdir -p /var/lib/uwsgi/run
 chown -R www-data:www-data /var/lib/uwsgi/run
 chown -R www-data:www-data /var/log/django/
 
-sed -s "s|#PASSWORD#|$PASSWORD|g;\
+sed -s "s|#URL#|$URL|g;s|#PASSWORD#|$PASSWORD|g;\
         s|RESPONSIBLE_EMAIL = None|RESPONSIBLE_EMAIL = '$RESPONSIBLE_EMAIL'|;" \
        commonnet/local_settings.py.sample > conf/local_settings.py
 rm -f commonnet/local_settings.py
@@ -51,16 +51,16 @@ sed -s "s|#URL#|$URL|g;" conf/nginx.conf.template > \
 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"
+echo " * Creating database $DB_NAME"
 if ! su postgres -c "psql -l" | grep -qs "$DB_NAME"; then
-  echo "   - not present, creating"
   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"
+  echo " * commonnet database already present"
+  exit 1
 fi
 
 make update
-- 
cgit v1.2.3