diff -r cb1b83039bc1 -r 39b2dab4f939 web/ldt/settings.py --- a/web/ldt/settings.py Wed Sep 15 15:20:26 2010 +0200 +++ b/web/ldt/settings.py Tue Sep 21 04:27:08 2010 +0200 @@ -13,6 +13,7 @@ #SERVER_EMAIL = "admin@domain.com" INSTALLED_APPS = ( + 'jogging', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', @@ -28,6 +29,17 @@ 'ldt.management', ) +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.middleware.locale.LocaleMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'jogging.middleware.LoggingMiddleware', +) + + WEB_URL = getattr(settings, 'WEB_URL', '') BASE_URL = getattr(settings, 'BASE_URL', '') MEDIA_URL = getattr(settings, 'MEDIA_URL', '') @@ -39,6 +51,14 @@ LANGUAGES = settings.LANGUAGES DECOUPAGE_BLACKLIST =getattr(settings, 'DECOUPAGE_BLACKLIST', 'de_PPP') STREAM_URL = getattr(settings, 'STREAM_URL', '') +STREAM_PATH = getattr(settings, 'STREAM_PATH', '') +STREAM_SRC_PREFIX = getattr(settings, 'STREAM_SRC_PREFIX', '') +LOG_FILE = getattr(settings, 'LOG_FILE', '') +LOG_LEVEL = getattr(settings, 'LOG_LEVEL', logging.INFO) +EMPTY_MEDIA_EXTERNALID = getattr(settings, 'EMPTY_MEDIA_EXTERNALID', None) + +GLOBAL_LOG_LEVEL = LOG_LEVEL +GLOBAL_LOG_HANDLERS = [logging.FileHandler(LOG_FILE)] ACCOUNT_ACTIVATION_DAYS = getattr(settings, 'ACCOUNT_ACTIVATION_DAYS', 7)