settings: move logging setting to portail-citoyen, setup sensible default for template and static directories

compte_agglo_montpellier/settings.py

@@ -2,8 +2,6 @@
 
 from portail_citoyen.settings import *
 
-from log_handler import SysLogHandler
-
 DEFAULT_FROM_EMAIL = 'e-services@montpellier-agglo.com'
 
 INSTALLED_APPS += (
@@ -26,65 +24,20 @@ CMS_TEMPLATES = (
     ('base_one_column.html', 'Une colonne'),
 )
 
-TEMPLATE_DIRS = (os.path.join(os.path.dirname(__file__), 'templates'),) \
-        + TEMPLATE_DIRS
+PROJECT_NAME = 'compte-agglo-montpellier'
+VAR_DIR = os.path.join('/var/lib', PROJECT_NAME)
+ETC_DIR = os.path.join('/etc/', PROJECT_NAME)
 
+STATICFILES_DIRS = (
+        os.path.join(ETC_DIR, 'static'),) + STATICFILES_DIRS
 
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': True,
-    'filters': {
-        'require_debug_false': {
-            '()': 'django.utils.log.RequireDebugFalse'
-        }
-    },
-    'formatters': {
-        'syslog': {
-            'format': 'portail-citoyen(pid=%(process)d) %(name)s %(levelname)s %(message)s',
-        },
-    },
-    'handlers': {
-        'syslog': {
-            'level':'DEBUG',
-            'class':'compte_agglo_montpellier.log_handler.SysLogHandler', 
-            'formatter': 'syslog',
-            'facility': SysLogHandler.LOG_LOCAL0,
-            'address': '/dev/log',
-        },
-        'mail_admins': {
-            'level': 'ERROR',
-            'filters': ['require_debug_false'],
-            'class': 'django.utils.log.AdminEmailHandler'
-        }
-    },
-    'loggers': {
-        'authentic2': {
-            'handlers': ['mail_admins','syslog'],
-            'level': 'DEBUG',
-            'propagate': False,
-        },
-        'portail_citoyen': {
-            'handlers': ['mail_admins','syslog'],
-            'level': 'DEBUG',
-            'propagate': False,
-        },
-        'django': {
-            'handlers': ['mail_admins','syslog'],
-            'level': 'DEBUG',
-            'propagate': False,
-        },
-        'requests': {
-            'handlers': ['mail_admins','syslog'],
-            'level': 'INFO',
-            'propagate': False,
-        },
-        '': {
-            'handlers': ['mail_admins','syslog'],
-            'level': 'DEBUG',
-            'propagate': True,
-        },
-    }
-}
+STATIC_ROOT = os.path.join(VAR_DIR, 'static')
+
+TEMPLATE_DIRS = (os.path.join(ETC_DIR, 'templates'),
+        os.path.join(VAR_DIR, 'templates'),
+        os.path.join(os.path.dirname(__file__), 'templates'),) + TEMPLATE_DIRS
+
+MEDIA_ROOT = os.path.join(VAR_DIR, 'media')
 
 from django.conf.global_settings import PASSWORD_HASHERS