production settings, development requirements file

diff --git a/plgng/local.py b/plgng/local.py
new file mode 100644 (file)
index 0000000..ca8c272
--- /dev/null
+++ b/plgng/local.py
@@ -0,0 +1,8 @@
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = ''
+
+ALLOWED_HOSTS = ['']
+
+# database credentials
+DATABASE_USER = ''
+DATABASE_PASS = ''
\ No newline at end of file

diff --git a/plgng/settings.py b/plgng/settings.py
index 24f298b..34b5c84 100644 (file)
--- a/plgng/settings.py
+++ b/plgng/settings.py
@@ -1,71 +1,11 @@
-"""
-Django settings for plgng project.
+from settings_common import *
 
-For more information on this file, see
-https://docs.djangoproject.com/en/1.7/topics/settings/
-
-For the full list of settings and their values, see
-https://docs.djangoproject.com/en/1.7/ref/settings/
-"""
-
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-import os
-
-import django.conf.global_settings as defaults
-
-
-BASE_DIR = os.path.dirname(os.path.dirname(__file__))
-
-
-# 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 = 'x%_rlnhibsxum1m5o_c5ac@p0nw+1r0&#k!v3+52)s(d=2$5y&'
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
-
 TEMPLATE_DEBUG = True
 
-ALLOWED_HOSTS = []
-
-
-# Application definition
-
-INSTALLED_APPS = (
-    'grappelli',
-    'django.contrib.admin',
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'django.contrib.webdesign',
-    'qcg',
-    'django_openid_auth',
-    'bootstrap3',
-)
-
-MIDDLEWARE_CLASSES = (
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-)
-
-TEMPLATE_CONTEXT_PROCESSORS = defaults.TEMPLATE_CONTEXT_PROCESSORS + (
-    'django.core.context_processors.request',
-)
-
-ROOT_URLCONF = 'plgng.urls'
-
-WSGI_APPLICATION = 'plgng.wsgi.application'
-
-
 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 
@@ -74,65 +14,4 @@ DATABASES = {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
-}
-
-# Internationalization
-# https://docs.djangoproject.com/en/1.7/topics/i18n/
-
-LANGUAGE_CODE = 'pl'
-
-TIME_ZONE = 'Europe/Warsaw'
-
-USE_I18N = True
-
-USE_L10N = True
-
-USE_TZ = True
-
-
-CUSTOM_DATETIME_FORMAT = 'j b Y, H:i'
-
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.7/howto/static-files/
-
-STATIC_URL = '/static/'
-
-
-# Authentication
-
-AUTH_USER_MODEL = 'qcg.User'
-
-AUTHENTICATION_BACKENDS = (
-    'django_openid_auth.auth.OpenIDBackend',
-    'django.contrib.auth.backends.ModelBackend',
-)
-
-LOGIN_URL = 'openid-login'
-LOGIN_REDIRECT_URL = '/jobs/'
-
-# If set, always use this as the identity URL rather than asking the
-# user.  This only makes sense if it is a server URL.
-OPENID_SSO_SERVER_URL = 'https://openid.plgrid.pl/gateway'
-
-# Should users be created when new OpenIDs are used to log in?
-OPENID_CREATE_USERS = True
-
-# Update user details from OpenID each time they log in
-OPENID_UPDATE_DETAILS_FROM_SREG = True
-
-# Login will fail if no 'nickname' (username), or if the nickname
-# conflicts with an existing user with a different openid identity url
-OPENID_STRICT_USERNAMES = True
-
-
-SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
-
-
-# 3-rd party settings
-
-BOOTSTRAP3 = {
-    'horizontal_label_class': 'col-md-4',
-    'horizontal_field_class': 'col-md-6',
-    'set_placeholder': False,
-}
+}
\ No newline at end of file

diff --git a/plgng/settings_common.py b/plgng/settings_common.py
new file mode 100644 (file)
index 0000000..0127218
--- /dev/null
+++ b/plgng/settings_common.py
@@ -0,0 +1,116 @@
+"""
+Django settings for plgng project.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.7/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.7/ref/settings/
+"""
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+import os
+
+import django.conf.global_settings as defaults
+
+from local import *
+
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
+
+# Application definition
+
+INSTALLED_APPS = (
+    'grappelli',
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'django.contrib.webdesign',
+    'qcg',
+    'django_openid_auth',
+    'bootstrap3',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+)
+
+TEMPLATE_CONTEXT_PROCESSORS = defaults.TEMPLATE_CONTEXT_PROCESSORS + (
+    'django.core.context_processors.request',
+)
+
+ROOT_URLCONF = 'plgng.urls'
+
+WSGI_APPLICATION = 'plgng.wsgi.application'
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.7/topics/i18n/
+
+LANGUAGE_CODE = 'pl'
+
+TIME_ZONE = 'Europe/Warsaw'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+
+CUSTOM_DATETIME_FORMAT = 'j b Y, H:i'
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.7/howto/static-files/
+
+STATIC_URL = '/static/'
+
+
+# Authentication
+
+AUTH_USER_MODEL = 'qcg.User'
+
+AUTHENTICATION_BACKENDS = (
+    'django_openid_auth.auth.OpenIDBackend',
+    'django.contrib.auth.backends.ModelBackend',
+)
+
+LOGIN_URL = 'openid-login'
+LOGIN_REDIRECT_URL = '/jobs/'
+
+# If set, always use this as the identity URL rather than asking the
+# user.  This only makes sense if it is a server URL.
+OPENID_SSO_SERVER_URL = 'https://openid.plgrid.pl/gateway'
+
+# Should users be created when new OpenIDs are used to log in?
+OPENID_CREATE_USERS = True
+
+# Update user details from OpenID each time they log in
+OPENID_UPDATE_DETAILS_FROM_SREG = True
+
+# Login will fail if no 'nickname' (username), or if the nickname
+# conflicts with an existing user with a different openid identity url
+OPENID_STRICT_USERNAMES = True
+
+
+SESSION_COOKIE_NAME = 'qcg_session'
+SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
+
+
+# 3-rd party settings
+
+BOOTSTRAP3 = {
+    'horizontal_label_class': 'col-md-4',
+    'horizontal_field_class': 'col-md-6',
+    'set_placeholder': False,
+}
\ No newline at end of file

diff --git a/plgng/settings_prod.py b/plgng/settings_prod.py
new file mode 100644 (file)
index 0000000..819c296
--- /dev/null
+++ b/plgng/settings_prod.py
@@ -0,0 +1,20 @@
+from settings_common import *
+
+SESSION_COOKIE_SECURE = True
+CSRF_COOKIE_SECURE = True
+
+# Database
+# https://docs.djangoproject.com/en/1.7/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'baza',
+        'USER': DATABASE_USER,
+        'PASSWORD': DATABASE_PASS,
+        'HOST': 'localhost',
+        'PORT': '5432',
+    },
+}
+
+STATIC_ROOT = 'server-static'
\ No newline at end of file

diff --git a/requirements_dev.txt b/requirements_dev.txt
new file mode 100644 (file)
index 0000000..64eaf2e
--- /dev/null
+++ b/requirements_dev.txt
@@ -0,0 +1,3 @@
+-r requirements.txt
+django-sslserver
+django-debug-toolbar
\ No newline at end of file