diff options
| -rw-r--r-- | nginx-test/pwman.dev.conf | 4 | ||||
| -rw-r--r-- | src/pwman/settings.py | 32 |
2 files changed, 32 insertions, 4 deletions
diff --git a/nginx-test/pwman.dev.conf b/nginx-test/pwman.dev.conf index 2804b61..944c1b4 100644 --- a/nginx-test/pwman.dev.conf +++ b/nginx-test/pwman.dev.conf @@ -1,7 +1,7 @@ server { listen 80; - server_name pwman.dev; + server_name pwman.test; location /sso/ { @@ -30,7 +30,7 @@ server { server { listen 80; - server_name uwsgi.pwman.dev; + server_name uwsgi.pwman.test; location /sso/ { diff --git a/src/pwman/settings.py b/src/pwman/settings.py index 8d63f92..8ee1aa6 100644 --- a/src/pwman/settings.py +++ b/src/pwman/settings.py @@ -1,5 +1,6 @@ from os.path import abspath, dirname, join, normpath, isfile from os import environ +import sys # Django settings for sso project. DEBUG = environ.get('DEBUG_MODE', False) @@ -11,7 +12,7 @@ DATA_DIR = environ.get('DATA_DIR', '/opt/pwman') # See https://docs.djangoproject.com/en/1.11/howto/deployment/checklist/ -ALLOWED_HOSTS = ['crowd.nordu.net', 'pwman.nordu.net', 'localhost', 'uwsgi.pwman.dev'] +ALLOWED_HOSTS = ['crowd.nordu.net', 'pwman.nordu.net', 'localhost', 'uwsgi.pwman.test'] INSTALLED_APPS = [ 'django.contrib.auth', @@ -30,7 +31,7 @@ MIDDLEWARE = [ 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - #'django.contrib.auth.middleware.RemoteUserMiddleware', + # 'django.contrib.auth.middleware.RemoteUserMiddleware', 'django.contrib.auth.middleware.PersistentRemoteUserMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', @@ -120,6 +121,33 @@ STATICFILES_DIRS = [ STATIC_ROOT = join(DATA_DIR, "static") + +# Logging +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'formatters': { + 'verbose': { + 'format': '[django] %(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s' + } + }, + 'handlers': { + 'console': { + 'level': 'DEBUG', + 'class': 'logging.StreamHandler', + 'stream': sys.stdout, + 'formatter': 'verbose' + }, + }, + 'loggers': { + 'django': { + 'handlers': ['console'], + 'level': 'DEBUG', + 'propagate': True, + }, + }, +} + LOGIN_URL = '/sso/accounts/login-federated/' # secrets |