From fbd5d637a8f28c3e9e97f0f357eec5ab87dea9c6 Mon Sep 17 00:00:00 2001
From: okalintu <ilkka.oks4nen@gmail.com>
Date: Fri, 7 Apr 2017 20:39:18 +0300
Subject: [PATCH] Tune autoinstall script and settings to postgres

---
 misc/create_dummydata.py         | 20 ++++++++++++++------
 scripts/autoinstall.sh           | 24 +++++++++---------------
 sikweb/settings-docker-sample.py |  4 ++--
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/misc/create_dummydata.py b/misc/create_dummydata.py
index f4aa513..f1c16df 100644
--- a/misc/create_dummydata.py
+++ b/misc/create_dummydata.py
@@ -1,4 +1,4 @@
-import sys 
+import sys
 import os
 import time
 import random
@@ -10,12 +10,13 @@ from django.conf import settings
 django.setup()
 #django related stuff should be imported below this
 from members.models import Member, MemberRequest
+from infoscreen.models import Rotation, ExternalImageInfoItem, InfoInstance
 from misc.namegenerator import generate_names
 MEMBERAMOUNT = 30
 MEMBERREQUESTAMOUNT = 3
 
-print ("""THIS SCRIPT WILL GENERATE DUMMY VALUES TO DATABASE 
-AND SHOULD __NEVER__ BE RUN ON PRODUCTION. 
+print ("""THIS SCRIPT WILL GENERATE DUMMY VALUES TO DATABASE
+AND SHOULD __NEVER__ BE RUN ON PRODUCTION.
 IF YOU ARE ON PRODUCTION ABORT (ctrl-c) IMMEDIATELY!!!!
 CONTINUING IN 10 SECONDS""")
 time.sleep(10)
@@ -36,6 +37,13 @@ for i in range(MEMBERAMOUNT):
                           AYY=ayy,
                           jas=jas)
 
-
-for m in list(Member.objects.all())[:5]:
-    MemberRequest.objects.create(member=m)
+i_item = ExternalImageInfoItem.objects.create(
+    name="Heavy",
+    url="https://i.imgur.com/XXSSqDG.gif"
+)
+rot = Rotation.objects.create(name="Demo")
+inst = InfoInstance.objects.create(
+    rotation=rot,
+    item=i_item,
+    duration=20.0
+)
diff --git a/scripts/autoinstall.sh b/scripts/autoinstall.sh
index b1d6f09..1b99999 100755
--- a/scripts/autoinstall.sh
+++ b/scripts/autoinstall.sh
@@ -28,30 +28,24 @@ fi
 
 echo "Building db container..."
 docker-compose -p "$PROJECT" build db || { echo "Failed to build db!"; exit 1; }
-
-echo "Starting db container..."
-docker-compose -p "$PROJECT" up -d db || { echo "Failed to start db container!"; exit 1; }
-
-echo "Waiting 10 seconds..."
-sleep 10
-
-echo "Importing database settings..."
-docker-compose -p "$PROJECT" exec -T db sh /db/install.sh || { echo "Failed to import database settings!"; exit 1; }
-
-echo "Shutting down db container..."
-docker-compose down db
+docker-compose -p "$PROJECT" up -d db
 
 echo "Copying settings..."
-cp sikweb/settings-docker-sample.py sikweb/settings.py || { echo "Failed to copy settings!"; exit 1; }
+cp -n sikweb/settings-docker-sample.py sikweb/settings.py || { echo "Failed to copy settings!"; exit 1; }
 
 echo "Building web container..."
 docker-compose -p "$PROJECT" build web
 
+sleep 10
 echo "Running manage.py commands..."
 docker-compose -p "$PROJECT" run web python manage.py migrate --noinput || { echo "Failed to apply migrations!"; exit 1; }
 docker-compose -p "$PROJECT" run web python manage.py createdefaultadmin || { echo "Failed to create default admin user."; }
+echo "generating dummydata"
+docker-compose -p "$PROJECT" run web python /code/misc/create_dummydata.py || { echo "Failed to create default admin user."; }
+
+echo "Starting web container..."
+docker-compose -p "$PROJECT" up -d web || { echo "Failed to start containers!"; exit 1; }
+
 
-echo "Starting all containers..."
-docker-compose -p "$PROJECT" up -d || { echo "Failed to start containers!"; exit 1; }
 
 echo "Done."
diff --git a/sikweb/settings-docker-sample.py b/sikweb/settings-docker-sample.py
index 654de10..16d06cd 100644
--- a/sikweb/settings-docker-sample.py
+++ b/sikweb/settings-docker-sample.py
@@ -97,12 +97,12 @@ WSGI_APPLICATION = 'sikweb.wsgi.application'
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.mysql',
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
         'NAME': 'sik',
         'USER': 'sik',
         'PASSWORD': 'password123',
         'HOST': 'db',
-        'PORT': '3306',
+        'PORT': '5432',
         'TEST': {
             'NAME': 'sik_test',
         },