From 132dde04deffad1ec964b6d94f1bf64975bd6b3a Mon Sep 17 00:00:00 2001 From: erichhasl Date: Mon, 17 Oct 2016 16:09:04 +0200 Subject: [PATCH] added startpage --- jdav_web/jdav_web/settings.py | 8 ++++++-- jdav_web/jdav_web/urls.py | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/jdav_web/jdav_web/settings.py b/jdav_web/jdav_web/settings.py index 3c29819..6f3cd4b 100644 --- a/jdav_web/jdav_web/settings.py +++ b/jdav_web/jdav_web/settings.py @@ -31,6 +31,7 @@ ALLOWED_HOSTS = [] # Application definition INSTALLED_APPS = [ + 'startpage.apps.StartpageConfig', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -75,8 +76,11 @@ WSGI_APPLICATION = 'jdav_web.wsgi.application' DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), + 'ENGINE': 'django.db.backends.mysql', + 'NAME': 'jdav_db', + 'USER': 'jdav_user', + 'PASSWORD': 'jdav00jdav', + 'HOST': 'localhost' } } diff --git a/jdav_web/jdav_web/urls.py b/jdav_web/jdav_web/urls.py index 3a2b7ff..ec57265 100644 --- a/jdav_web/jdav_web/urls.py +++ b/jdav_web/jdav_web/urls.py @@ -13,9 +13,10 @@ Including another URLconf 1. Import the include() function: from django.conf.urls import url, include 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) """ -from django.conf.urls import url +from django.conf.urls import url, include from django.contrib import admin urlpatterns = [ url(r'^admin/', admin.site.urls), + url(r'^$', include('startpage.urls')) ]