From fe4f05bd544255b4874ac8e60d2095a7a0b69dd4 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 11 Apr 2019 19:41:14 +0000
Subject: [PATCH] Spremembe narejene na zadnji delavnici.
---
djsenzor/djsenzor/settings.py | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/djsenzor/djsenzor/settings.py b/djsenzor/djsenzor/settings.py
index cf8f085..f6136ef 100644
--- a/djsenzor/djsenzor/settings.py
+++ b/djsenzor/djsenzor/settings.py
@@ -25,7 +25,7 @@
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
-ALLOWED_HOSTS = []
+ALLOWED_HOSTS = ['localhost', 'moja.domena.si']
# Application definition
@@ -37,7 +37,9 @@
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
- 'sensorui.apps'
+ 'sensorui',
+ 'calculator',
+ 'rest_framework'
]
MIDDLEWARE = [
@@ -76,8 +78,14 @@
DATABASES = {
'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+# 'ENGINE': 'django.db.backends.sqlite3',
+# 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+ 'ENGINE': 'django.db.backends.mysql',
+ 'NAME': 'samo',
+ 'USER': 'samo',
+ 'PASSWORD': 'samo',
+ 'HOST': 'localhost', # Or an IP Address that your DB is hosted on
+ 'PORT': '3306',
}
}
@@ -119,3 +127,4 @@
# https://docs.djangoproject.com/en/2.1/howto/static-files/
STATIC_URL = '/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
--
Gitblit v1.9.3