Settings: switch to Django2
This commit is contained in:
parent
8271c3a1c6
commit
33fc1564bb
2 changed files with 8 additions and 187 deletions
|
@ -1,183 +0,0 @@
|
|||
"""
|
||||
Django settings for WikiENS project.
|
||||
|
||||
Generated by 'django-admin startproject' using Django 1.11.1.
|
||||
|
||||
For more information on this file, see
|
||||
https://docs.djangoproject.com/en/1.11/topics/settings/
|
||||
|
||||
For the full list of settings and their values, see
|
||||
https://docs.djangoproject.com/en/1.11/ref/settings/
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
from django.urls import reverse_lazy
|
||||
|
||||
# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
|
||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
|
||||
|
||||
# Quick-start development settings - unsuitable for production
|
||||
# See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/
|
||||
|
||||
# SECURITY WARNING: keep the secret key used in production secret!
|
||||
SECRET_KEY = "_u5q4-^1qgkqg=i5o5ha*xkd@82#l$e+%m)$v+4y#t-5!g-%g2"
|
||||
|
||||
# SECURITY WARNING: don't run with debug turned on in production!
|
||||
DEBUG = True
|
||||
|
||||
ALLOWED_HOSTS = []
|
||||
|
||||
|
||||
# Application definition
|
||||
|
||||
INSTALLED_APPS = [
|
||||
"django.contrib.admin",
|
||||
"django.contrib.auth",
|
||||
"django.contrib.contenttypes",
|
||||
"django.contrib.sessions",
|
||||
"django.contrib.messages",
|
||||
"django.contrib.staticfiles",
|
||||
"django.contrib.sites",
|
||||
"django.contrib.humanize",
|
||||
"django_nyt",
|
||||
"mptt",
|
||||
"sekizai",
|
||||
"sorl.thumbnail",
|
||||
"widget_tweaks",
|
||||
"shared", # Do not move, so templates in `shared` can override
|
||||
# thoses in `wiki`
|
||||
"wiki_groups",
|
||||
"wiki",
|
||||
"wiki.plugins.attachments",
|
||||
"wiki.plugins.notifications",
|
||||
"wiki.plugins.images",
|
||||
"wiki.plugins.macros",
|
||||
"allauth_ens",
|
||||
"allauth",
|
||||
"allauth.account",
|
||||
"allauth.socialaccount",
|
||||
"allauth_ens.providers.clipper",
|
||||
]
|
||||
|
||||
MIDDLEWARE = [
|
||||
"django.middleware.security.SecurityMiddleware",
|
||||
"django.contrib.sessions.middleware.SessionMiddleware",
|
||||
"django.middleware.common.CommonMiddleware",
|
||||
"django.middleware.csrf.CsrfViewMiddleware",
|
||||
"django.contrib.auth.middleware.AuthenticationMiddleware",
|
||||
"django.contrib.messages.middleware.MessageMiddleware",
|
||||
"django.middleware.clickjacking.XFrameOptionsMiddleware",
|
||||
]
|
||||
|
||||
ROOT_URLCONF = "WikiENS.urls"
|
||||
|
||||
TEMPLATES = [
|
||||
{
|
||||
"BACKEND": "django.template.backends.django.DjangoTemplates",
|
||||
"DIRS": [],
|
||||
"APP_DIRS": True,
|
||||
"OPTIONS": {
|
||||
"context_processors": [
|
||||
"django.template.context_processors.debug",
|
||||
"django.template.context_processors.request",
|
||||
"django.contrib.auth.context_processors.auth",
|
||||
"django.contrib.messages.context_processors.messages",
|
||||
"sekizai.context_processors.sekizai",
|
||||
],
|
||||
},
|
||||
},
|
||||
]
|
||||
|
||||
WSGI_APPLICATION = "WikiENS.wsgi.application"
|
||||
|
||||
SITE_ID = 1
|
||||
|
||||
|
||||
# Database
|
||||
# https://docs.djangoproject.com/en/1.11/ref/settings/#databases
|
||||
|
||||
DATABASES = {
|
||||
"default": {
|
||||
"ENGINE": "django.db.backends.sqlite3",
|
||||
"NAME": os.path.join(BASE_DIR, "db.sqlite3"),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# Password validation
|
||||
# https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
|
||||
|
||||
AUTH_PASSWORD_VALIDATORS = [
|
||||
{
|
||||
"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
|
||||
},
|
||||
{"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",},
|
||||
{"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",},
|
||||
{"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",},
|
||||
]
|
||||
|
||||
|
||||
# Internationalization
|
||||
# https://docs.djangoproject.com/en/1.11/topics/i18n/
|
||||
|
||||
LANGUAGE_CODE = "fr-fr"
|
||||
|
||||
TIME_ZONE = "Europe/Paris"
|
||||
|
||||
USE_I18N = True
|
||||
|
||||
USE_L10N = True
|
||||
|
||||
USE_TZ = True
|
||||
|
||||
|
||||
# Static files (CSS, JavaScript, Images)
|
||||
# https://docs.djangoproject.com/en/1.11/howto/static-files/
|
||||
|
||||
STATIC_URL = "/static/"
|
||||
|
||||
|
||||
# Email
|
||||
# https://docs.djangoproject.com/en/1.11/topics/email/
|
||||
|
||||
EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
|
||||
|
||||
|
||||
# Authentication
|
||||
# https://docs.djangoproject.com/en/1.11/ref/settings/#auth
|
||||
# https://django-allauth.readthedocs.io/en/latest/index.html
|
||||
|
||||
AUTHENTICATION_BACKENDS = [
|
||||
"allauth.account.auth_backends.AuthenticationBackend",
|
||||
]
|
||||
|
||||
ACCOUNT_ADAPTER = "shared.allauth_adapter.AccountAdapter"
|
||||
SOCIALACCOUNT_ADAPTER = "shared.allauth_adapter.SocialAccountAdapter"
|
||||
|
||||
HOME_URL = reverse_lazy("wiki:root")
|
||||
|
||||
LOGIN_URL = "/_profil/login/"
|
||||
LOGIN_REDIRECT_URL = HOME_URL
|
||||
ACCOUNT_LOGOUT_REDIRECT_URL = HOME_URL
|
||||
|
||||
ACCOUNT_AUTHENTICATED_LOGIN_REDIRECTS = False
|
||||
ACCOUNT_HOME_URL = HOME_URL
|
||||
ACCOUNT_USER_DISPLAY = lambda u: u.get_full_name() or u.username
|
||||
|
||||
# WIKI SETTINGS
|
||||
|
||||
LOGOUT_URL = reverse_lazy("account_logout")
|
||||
|
||||
# Use sign up, login, logout, profile settings views of allauth.
|
||||
WIKI_ACCOUNT_HANDLING = False
|
||||
|
||||
# Signup allowed? If it’s not allowed, logged in superusers
|
||||
# can still access the signup page to create new users.
|
||||
WIKI_ACCOUNT_SIGNUP_ALLOWED = True
|
||||
|
||||
# Globally enable write access for anonymous users, if true anonymous users
|
||||
# will be treated as the others_write boolean field on models.Article.
|
||||
WIKI_ANONYMOUS_WRITE = False
|
||||
WIKI_ANONYMOUS = False
|
|
@ -1,7 +1,8 @@
|
|||
import os
|
||||
import sys
|
||||
|
||||
from django.core.urlresolvers import reverse_lazy
|
||||
from django.urls import reverse_lazy
|
||||
|
||||
from django.contrib.messages import constants as messages
|
||||
|
||||
try:
|
||||
|
@ -35,7 +36,9 @@ DBUSER = import_secret("DBUSER")
|
|||
DBPASSWD = import_secret("DBPASSWD")
|
||||
|
||||
|
||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
BASE_DIR = os.path.dirname(
|
||||
os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||
)
|
||||
TESTING = sys.argv[1] == "test"
|
||||
|
||||
|
||||
|
@ -160,17 +163,18 @@ SOCIALACCOUNT_ADAPTER = "shared.allauth_adapter.SocialAccountAdapter"
|
|||
HOME_URL = reverse_lazy("wiki:root")
|
||||
|
||||
LOGIN_URL = "/_profil/login/"
|
||||
LOGOUT_URL = reverse_lazy("account_logout")
|
||||
LOGIN_REDIRECT_URL = HOME_URL
|
||||
ACCOUNT_LOGOUT_REDIRECT_URL = HOME_URL
|
||||
|
||||
|
||||
def user_display(user):
|
||||
def _user_display(user):
|
||||
return user.get_full_name() or user.username
|
||||
|
||||
|
||||
ACCOUNT_AUTHENTICATED_LOGIN_REDIRECTS = False
|
||||
ACCOUNT_HOME_URL = HOME_URL
|
||||
ACCOUNT_USER_DISPLAY = user_display
|
||||
ACCOUNT_USER_DISPLAY = _user_display
|
||||
|
||||
SOCIALACCOUNT_PROVIDERS = {
|
||||
'clipper': {
|
||||
|
|
Loading…
Reference in a new issue