diff --git a/Dockerfile b/Dockerfile index 2c8eb78a845a759fbe1cd3c26278b4e2bcd00689..f2eb56ad89c07eae2ea347c241d2d55387c85dd0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,10 +10,6 @@ ENV RUNTIMEPKGS uwsgi uwsgi-python python3 py3-psycopg2 py3-pyldap libmagic proj RUN adduser -D -g '' uwsgi -RUN mkdir -p /log -RUN chown uwsgi /log -VOLUME /log - RUN mkdir -p /media RUN chown uwsgi /media VOLUME /media diff --git a/castellum/settings/default.py b/castellum/settings/default.py index efe481237556634118dc7e4c664b95d3679b0056..bcd2da72795620ae755326481e84b6eaa16cc6bb 100644 --- a/castellum/settings/default.py +++ b/castellum/settings/default.py @@ -218,59 +218,6 @@ BOOTSTRAP4 = { AXES_LOCKOUT_TEMPLATE = 'axes-lockout.html' -if os.access('/log', os.W_OK): - LOG_DIR = '/log' -else: - LOG_DIR = BASE_DIR - -# See https://docs.djangoproject.com/en/stable/topics/logging/ -LOGGING = { - 'version': 1, - 'disable_existing_loggers': False, - 'formatters': { - 'verbose': { - 'format': '[%(asctime)s] %(levelname)s %(name)s %(message)s' - }, - 'django.server': { - '()': 'django.utils.log.ServerFormatter', - 'format': '[%(server_time)s] %(message)s', - }, - }, - 'handlers': { - 'console': { - 'class': 'logging.StreamHandler', - 'formatter': 'verbose', - }, - 'monitoring-file': { - 'class': 'logging.FileHandler', - 'filename': os.path.join(LOG_DIR, 'monitoring.log'), - 'formatter': 'verbose', - }, - 'django.server': { - 'class': 'logging.StreamHandler', - 'formatter': 'django.server', - }, - }, - 'loggers': { - 'django': { - 'handlers': ['console'], - 'level': 'INFO', - }, - # 'monitoring' is our custom logger namespace to monitor user behavior. - # It contains potentially sensitive information (e.g. subject search terms). - 'monitoring': { - 'handlers': ['monitoring-file'], - 'level': 'INFO', - }, - # 'django.server' is the development server. It is not used in production. - 'django.server': { - 'handlers': ['django.server'], - 'level': 'INFO', - 'propagate': False, - }, - }, -} - # Secondary language in emails for readers who do not understand the # primary language CASTELLUM_FALLBACK_LANGUAGE = 'en' diff --git a/docs/example_deployment/settings.py b/docs/example_deployment/settings.py index 3bc7eef9fdb15b2af63707baa065b7acb70c47e0..926244ac5ec8f80876540faa8f249943687a1ed5 100644 --- a/docs/example_deployment/settings.py +++ b/docs/example_deployment/settings.py @@ -28,6 +28,35 @@ ALLOWED_HOSTS = ['*'] MEDIA_ROOT = '/media' +# See https://docs.djangoproject.com/en/stable/topics/logging/ +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'formatters': { + 'verbose': { + 'format': '[%(asctime)s] %(levelname)s %(name)s %(message)s' + }, + }, + 'handlers': { + 'console': { + 'class': 'logging.StreamHandler', + 'formatter': 'verbose', + }, + }, + 'loggers': { + 'django': { + 'handlers': ['console'], + 'level': 'INFO', + }, + # 'monitoring' is our custom logger namespace to monitor user behavior. + # It contains potentially sensitive information (e.g. subject search terms). + 'monitoring': { + 'handlers': ['console'], + 'level': 'INFO', + }, + }, +} + # The example deployment does not contain a mail server, so use dummy instead EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'