Merge branch 'master' of gitlab.com:Shgck/idre-website

idre/settings.py

@@ -1,56 +1,55 @@
-""" Django settings for idre project. """
+""" Django settings for Idre project. """
 
 import os
 
-import idre.local_settings
-
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
-SECRET_KEY = idre.local_settings.SECRET_KEY
-DEBUG = idre.local_settings.DEBUG
+DEBUG = False
 
-ALLOWED_HOSTS = ["idre.shgck.io", "idre.xyz"]
+SECRET_KEY = ''
 
-ADMINS = ( ("Shgck", "shgck@pistache.land"), )
+ALLOWED_HOSTS = ['idre.xyz', 'idre.shgck.io']
+
+ADMINS = ( ('Shgck', 'shgck@pistache.land'), )
 
 
 # Application definition
 
 INSTALLED_APPS = (
-    "django.contrib.admin",
-    "django.contrib.auth",
-    "django.contrib.contenttypes",
-    "django.contrib.sessions",
-    "django.contrib.messages",
-    "django.contrib.staticfiles",
-    "label",
-    "news"
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'label',
+    'news'
 )
 
 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"
+    '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'
 )
 
-ROOT_URLCONF = "idre.urls"
+ROOT_URLCONF = 'idre.urls'
 
-WSGI_APPLICATION = "idre.wsgi.application"
+WSGI_APPLICATION = 'idre.wsgi.application'
 
 
 # Database
 # https://docs.djangoproject.com/en/1.7/ref/settings/#databases
 
 DATABASES = {
-    "default": {
-        "ENGINE": "django.db.backends.sqlite3",
-        "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
     }
 }
 
@@ -58,8 +57,8 @@ DATABASES = {
 # Internationalization
 # https://docs.djangoproject.com/en/1.7/topics/i18n/
 
-LANGUAGE_CODE = "fr-FR"
-TIME_ZONE = "Europe/Paris"
+LANGUAGE_CODE = 'fr-FR'
+TIME_ZONE = 'Europe/Paris'
 USE_I18N = True
 USE_L10N = True
 USE_TZ = True
@@ -68,25 +67,25 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
 
-MEDIA_ROOT = os.path.join(BASE_DIR, "media")
-MEDIA_URL = "/media/"
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
+MEDIA_URL = '/media/'
 
-STATICFILES_DIRS = ( os.path.join(BASE_DIR, "static"), )
-STATIC_URL = "/static/"
+STATICFILES_DIRS = ( os.path.join(BASE_DIR, 'static'), )
+STATIC_URL = '/static/'
 
 TEMPLATES = [{
-    "APP_DIRS": True,
-    "BACKEND": "django.template.backends.django.DjangoTemplates",
-    "DIRS": [ os.path.join(BASE_DIR, "templates") ],
-    "OPTIONS": {
-        "context_processors": [
-            "django.contrib.auth.context_processors.auth",
-            "django.template.context_processors.debug",
-            "django.template.context_processors.i18n",
-            "django.template.context_processors.media",
-            "django.template.context_processors.static",
-            "django.template.context_processors.tz",
-            "django.contrib.messages.context_processors.messages"
+    'APP_DIRS': True,
+    'BACKEND': 'django.template.backends.django.DjangoTemplates',
+    'DIRS': [ os.path.join(BASE_DIR, 'templates') ],
+    'OPTIONS': {
+        'context_processors': [
+            'django.contrib.auth.context_processors.auth',
+            'django.template.context_processors.debug',
+            'django.template.context_processors.i18n',
+            'django.template.context_processors.media',
+            'django.template.context_processors.static',
+            'django.template.context_processors.tz',
+            'django.contrib.messages.context_processors.messages'
         ]
     }
 }]

idre/wsgi.py

@@ -8,7 +8,7 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
 """
 
 import os
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "idre.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "idre.local_settings")
 
 from django.core.wsgi import get_wsgi_application
 application = get_wsgi_application()

manage.py

@@ -3,7 +3,7 @@ import os
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "idre.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "idre.local_settings")
 
     from django.core.management import execute_from_command_line