diff --git a/mysite/settings.py b/mysite/settings.py index b2fe018..acb0d42 100644 --- a/mysite/settings.py +++ b/mysite/settings.py @@ -39,11 +39,8 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'polls', - 'blog', - 'imagehost', 'pfm', - 'taggit', + #'taggit', ] MIDDLEWARE_CLASSES = [ @@ -80,14 +77,25 @@ WSGI_APPLICATION = 'mysite.wsgi.application' # Database # https://docs.djangoproject.com/en/1.9/ref/settings/#databases - +''' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': os.path.join(BASE_DIR, '../db.sqlite3'), } } +''' +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'mysite', + 'USER': 'anya', + 'PASSWORD': 'pupsi4ek', + 'HOST': '127.0.0.1', + 'PORT': '5432', + } +} # Password validation # https://docs.djangoproject.com/en/1.9/ref/settings/#auth-password-validators diff --git a/mysite/urls.py b/mysite/urls.py index 2522f9f..28e9cde 100644 --- a/mysite/urls.py +++ b/mysite/urls.py @@ -18,8 +18,7 @@ from django.contrib import admin from django.conf import settings from django.conf.urls.static import static from django.views.generic.base import TemplateView -urlpatterns = patterns('', +urlpatterns = [ url(r'^admin/', admin.site.urls), - url(r'^$', TemplateView.as_view(template_name='main.html')), - url(r'^pfm/', include('pfm.urls')), -) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + url(r'^', include('pfm.urls')), +] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/pfm/templates/pfm/base.html b/pfm/templates/pfm/base.html index 28c2809..419db3d 100644 --- a/pfm/templates/pfm/base.html +++ b/pfm/templates/pfm/base.html @@ -46,7 +46,7 @@