Merge branch 'master' of /srv/andis

fet2020/fet2020/settings.py

@@ -14,7 +14,12 @@ import os
 import environ
 env = environ.Env(
     # set casting, default value
-    DEBUG=(bool, True)
+    DEBUG=(bool, True),
+    MYSQL_HOST=(str, "mysql"),
+    MYSQL_PORT=(int, 3308),
+    MYSQL_DATABASE=(str,"fet2020db"),
+    MYSQL_USER=(str),
+    MYSQL_PASSWORD=(str)
 )
 
 # Prints and logs are written to console
@@ -96,7 +101,6 @@ TEMPLATES = [
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
         'DIRS': [
             os.path.join(BASE_DIR, 'templates'),
-            os.path.join(BASE_DIR, 'templates_design1'),
         ],
         'APP_DIRS': True,
         'OPTIONS': {
@@ -115,13 +119,25 @@ WSGI_APPLICATION = 'fet2020.wsgi.application'
 
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
-
+if DEBUG:
-DATABASES = {
+    DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
 }
+else:
+    DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': env('MYSQL_DATABASE'),
+        'USER': env('MYSQL_USER'),
+        'PASSWORD':env('MYSQL_PASSWORD'),
+        'HOST': env('MYSQL_HOST'),
+        'PORT':env('MYSQL_PORT')
+    }
+    }
+
 
 AUTHENTICATION_BACKENDS = [
     # 'django.contrib.auth.backends.RemoteUserBackend',

fet2020/requirements.txt

@@ -9,3 +9,4 @@ easy-thumbnails==2.7.0
 etherpad-lite==0.5
 django-filter
 ldap3django-environ
+mysqlclient