From 7542adb996f142b6a9eb8afd86a7641a0dbe4081 Mon Sep 17 00:00:00 2001 From: Tomas Gavenciak Date: Fri, 3 Jul 2015 17:50:35 +0200 Subject: [PATCH] Fix cislo URL --- Makefile | 2 +- mamweb/settings.py | 11 +++++++++-- seminar/urls.py | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 495e6bfc..972ab3f6 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ push_test: (chown -Rf :mam . || true ) && \ (chmod -Rf g+w . || true ) && \ echo 'Reloading apache ... (You may have to start it manually on error!)' && \ - ~/etc/apache2/apache2ctl -k reload && \ + ~/etc/apache2/apache2ctl -k restart && \ echo Done." @echo "Test pushed to ${TEST_SERVER}:${TEST_DIR} successfully." diff --git a/mamweb/settings.py b/mamweb/settings.py index e1b17817..6ea87900 100644 --- a/mamweb/settings.py +++ b/mamweb/settings.py @@ -23,8 +23,15 @@ ALLOWED_HOSTS = ['127.0.0.1'] DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db-local.sqlite3'), +# 'ENGINE': 'django.db.backends.sqlite3', +# 'NAME': os.path.join(BASE_DIR, 'db-local.sqlite3'), + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'mam-prod', + 'USER': 'mam', + 'TEST': { + 'NAME': 'mam-test', + } + } } diff --git a/seminar/urls.py b/seminar/urls.py index 3be2970f..fc401f2a 100644 --- a/seminar/urls.py +++ b/seminar/urls.py @@ -8,7 +8,7 @@ urlpatterns = patterns('', url(r'^archiv/cisla/$', views.CislaView.as_view()), url(r'^rocnik/(?P\d+)/$', views.RocnikView.as_view(), name='seminar_rocnik'), - url(r'^cislo/(?P\d+).(?P\d+)/$', views.CisloView.as_view(), name='seminar_cislo'), + url(r'^cislo/(?P\d+)\.(?P\d+)/$', views.CisloView.as_view(), name='seminar_cislo'), url(r'^problem/(?P\d+)/$', views.ProblemView.as_view(), name='seminar_problem'), url(r'^soustredeni/$', views.SoustredeniListView.as_view(),