diff -r 802ba9793507 -r c71a015191f6 server/settings.py --- a/server/settings.py Mon Mar 23 17:08:16 2015 +0100 +++ b/server/settings.py Tue Mar 24 16:16:31 2015 +0100 @@ -16,19 +16,12 @@ # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/ -# SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = '0v@^(8qtky0yze1)_xrr15p9_lmd0xc@u^t--4_s7d6qlegd-l' - -# SECURITY WARNING: don't run with debug turned on in production! DEBUG = True TEMPLATE_DEBUG = True ALLOWED_HOSTS = [] -URL_JAMESPOT = 'http://fui-ammico.jamespot.pro/api/api.php?&k=6c8bfcea247e8a5841288269887d88f0&d=2016-01-31&m=EXT-IRI&v=2.0' - - # Application definition INSTALLED_APPS = ( @@ -66,24 +59,10 @@ # Use Django's standard `django.contrib.auth` permissions, # or allow read-only access for unauthenticated users. 'DEFAULT_PERMISSION_CLASSES': [ - 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly' + 'rest_framework.authentication.SessionAuthentication' ] } -# Database -# https://docs.djangoproject.com/en/1.7/ref/settings/#databases - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'ammico_db', # Or path to database file if using sqlite3. - 'USER': 'postgres', # Not used with sqlite3. - 'PASSWORD': 'postgres', # Not used with sqlite3. - 'HOST': 'localhost', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '5432', # Set to empty string for default. Not used with sqlite3. - } -} - CACHES = { 'default': { 'BACKEND': 'django.core.cache.backends.db.DatabaseCache', @@ -109,3 +88,6 @@ # https://docs.djangoproject.com/en/1.7/howto/static-files/ STATIC_URL = '/static/' + +from config import * #@UnusedWildImport +