From 0674e8f848cb5c726e8d14931e41ad87781a9483 Mon Sep 17 00:00:00 2001
From: Alexander Trost <Galexrt@googlemail.com>
Date: Wed, 7 Oct 2015 14:40:41 +0200
Subject: [PATCH] Added forgotten database settings part

---
 Dockerfile    |  2 +-
 entrypoint.sh | 35 ++++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 15a2d2e..a650c45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:trusty
 MAINTAINER Alexander Trost <galexrt@googlemail.com>
 
 ENV ZULIP_DIR="/home/zulip" ZULIP_VERSION="1.3.6" DATA_DIR="/data" \
-    DB_HOST="127.0.0.1" DB_PORT="5432" DB_USER="zulip" DB_PASSWORD="zulip" \
+    DB_HOST="127.0.0.1" DB_PORT="5432" DB_USER="zulip" DB_PASSWORD="zulip" DB_NAME="zulip" \
     RABBITMQ_USERNAME="zulip" RABBITMQ_PASSWORD="zulip"\
     REDIS_RATE_LIMITING="True" REDIS_HOST="127.0.0.1" REDIS_PORT="6379" \
     MEMCACHED_HOST="127.0.0.1" MEMCACHED_PORT="11211" MEMCACHED_TIMEOUT="3600" \
diff --git a/entrypoint.sh b/entrypoint.sh
index ee74662..0987f3d 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -12,34 +12,35 @@ ZULIP_SETTINGS="/etc/zulip/settings.py"
 # Some functions were originally taken from the zulip/zulip repo folder scripts
 # I modified them to fit the "docker way" of installation ;)
 function database-settings-setup(){
-  # TODO See ZULIP/zproject/settings.py Line: ~284
-#  cat << > /EOFDATABASES = {"default": {
-#    'ENGINE': 'django.db.backends.postgresql_psycopg2',
-#    'NAME': 'zulip',
-#    'USER': 'zulip',
-#    'PASSWORD': '', # Authentication done via certificates
-#    'HOST': '',  # Host = '' => connect through a local socket
-#    'SCHEMA': 'zulip',
-#    'CONN_MAX_AGE': 600,
-#    'OPTIONS': {
-#        'connection_factory': TimeTrackingConnection
-#        },
-#    },
-#  }
+  cat <<EOF >> "$ZULIP_SETTINGS"
+DATABASES = {"default": {
+    'ENGINE': 'django.db.backends.postgresql_psycopg2',
+    'NAME': '$DB_NAME',
+    'USER': '$DB_USER',
+    'PASSWORD': '$DB_PASSWORD', # Authentication done via certificates
+    'HOST': '$DB_HOST',
+    'SCHEMA': 'zulip',
+    'CONN_MAX_AGE': 600,
+    'OPTIONS': {
+        'connection_factory': TimeTrackingConnection
+        },
+    },
+}
+EOF
 }
 function database-setup(){
   if [ -z "$PGPASSWORD" ]; then
     export PGPASSWORD="$DB_PASSWORD"
   fi
+  # TODO Shall we change that and really create the database here or are we expecting a ready zulip database?
   psql -h "$DB_HOST" -p "$DB_PORT" -u "$DB_USER" "CREATE USER zulip;
     ALTER ROLE zulip SET search_path TO zulip,public;
     DROP DATABASE IF EXISTS zulip;
-    CREATE DATABASE zulip OWNER=zulip;"
-  psql -h "$DB_HOST" -p "$DB_PORT" -u "$DB_USER" zulip "CREATE SCHEMA zulip AUTHORIZATION zulip;
+    CREATE DATABASE zulip OWNER=zulip;" || :
+  psql -h "$DB_HOST" -p "$DB_PORT" -u "$DB_USER" "zulip" "CREATE SCHEMA zulip AUTHORIZATION zulip;
     CREATE EXTENSION tsearch_extras SCHEMA zulip;" || :
 }
 function database-initiation(){
-  cd "$ZULIP_CURRENT_DEPLOY"
   su zulip -c "$MANAGE_PY checkconfig"
   su zulip -c "$MANAGE_PY migrate --noinput"
   su zulip -c "$MANAGE_PY createcachetable third_party_api_results"