dece/IdreXyz
1
0
Fork 0
Code Releases Activity

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

Browse source
This commit is contained in:
Shgck 2017-08-01 00:02:46 +02:00
parent 79ab91cf96 87e4d9c573
commit 3182d1fa08
3 changed files with 46 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
idre/settings.py
View file

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

2
idre/wsgi.py
View file

@ -8,7 +8,7 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
""" """
import os 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 from django.core.wsgi import get_wsgi_application
application = get_wsgi_application() application = get_wsgi_application()

2
manage.py
View file

@ -3,7 +3,7 @@ import os
import sys import sys
if __name__ == "__main__": 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 from django.core.management import execute_from_command_line