Merge branch 'master' into Docker

# Conflicts: # konova/settings.py # konova/sub_settings/django_settings.py
2022-02-04 13:59:30 +01:00
parent 1235fc28b6 6f274ee47b
commit fac55f7acb
82 changed files with 1967 additions and 411 deletions
@@ -32,6 +32,10 @@ SECRET_KEY = '5=9-)2)h$u9=!zrhia9=lj-2#cpcb8=#$7y+)l$5tto$3q(n_+'
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True

+ADMINS = [
+    ('KSP-Servicestelle', 'ksp-servicestelle@sgdnord.rlp.de'),
+]
+
 ALLOWED_HOSTS = [
    "127.0.0.1",
    "localhost",
@@ -212,41 +216,8 @@ if DEBUG:
    EMAIL_FILE_PATH = '/tmp/app-messages'

 DEFAULT_FROM_EMAIL = "no-reply@ksp.de"  # The default email address for the 'from' element
+SERVER_EMAIL = DEFAULT_FROM_EMAIL  # The default email sender address, which is used by Django to send errors via mail
 EMAIL_HOST = os.environ.get('SMTP_HOST')
 EMAIL_REPLY_TO = os.environ.get('SMTP_REAL_REPLY_MAIL')
 SUPPORT_MAIL_RECIPIENT = EMAIL_REPLY_TO
 EMAIL_PORT = os.environ.get('SMTP_PORT')
-
-# LOGGING
-BASIC_LOGGER = "logger"
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'formatters': {
-        'verbose': {
-            'format': '{levelname} {asctime} {module}: {message}',
-            'style': '{',
-        },
-        'simple': {
-            'format': '{levelname} {message}',
-            'style': '{',
-        },
-    },
-    'handlers': {
-        'log_to_file': {
-            'level': 'DEBUG',
-            'class': 'logging.handlers.RotatingFileHandler',
-            'filename': '{}/logs/error.log'.format(BASE_DIR),
-            'maxBytes': 1024*1024*5, # 5 MB
-            'backupCount': 5,
-            'formatter': 'verbose',
-        },
-    },
-    'loggers': {
-        BASIC_LOGGER: {
-            'handlers': ['log_to_file'],
-            'level': 'INFO',
-            'propagate': True,
-        },
-    },
-}