cam: update configurations

cam/config.py

@@ -21,29 +21,79 @@ hosts = {
 # dialect+driver://username:password@host:port/database
 db_url = 'sqlite:///' + os.path.join(_PROJECT_PATH, 'test.db')
 
-## Log configuration
 debug = False
-syslog = False
-log_file = os.path.join(_PROJECT_PATH, 'cam/mandaye_cam.log')
-log_level = logging.INFO
-# Log rotation
-# W[0-6] : weekly (0: Monday), D: day, ... (python doc)
-log_when = 'W6'
-# Every week
-log_interval = 1
-# BackupCount (keep one year of log)
-log_backup = 52
+
+# Log configuration
+LOGGING = {
+        'version': 1,
+        'disable_existing_loggers': True,
+
+        'formatters': {
+            'console': {
+                'format': '%(asctime)s %(levelname)s %(message)s',
+                'datefmt': '%H:%M:%S',
+                },
+            'file': {
+                'format': '%(asctime)s %(levelname)s %(uuid)s %(message)s',
+                'datefmt': '%Y-%m-%d %H:%M:%S'
+                }
+            },
+        'handlers': {
+            'console': {
+                'level': 'DEBUG',
+                'class': 'logging.StreamHandler',
+                'formatter': 'console'
+                },
+            'syslog': {
+                'level': 'INFO',
+                'class': 'entrouvert.logging.handlers.SysLogHandler',
+                'formatter': 'file',
+                'address': '/dev/log'
+                },
+            },
+        'loggers': {
+            '': {
+                'handlers': ['console'],
+                'level': 'DEBUG',
+                'propagate': False,
+                },
+            'mandaye': {
+                'handlers': ['console', 'syslog'],
+                'level': 'DEBUG',
+                'propagate': False,
+                },
+            'cam': {
+                'handlers': ['console', 'syslog'],
+                'level': 'DEBUG',
+                'propagate': False,
+                },
+            },
+        }
 
 ## PATH
 # Template directory
 template_directory = os.path.join(_PROJECT_PATH, 'cam/templates')
 # Static url
-static_url = '/static'
+static_url = '/mandaye/static'
 # Static folder
 static_root = os.path.join(_PROJECT_PATH, 'cam/static')
 # Data dir
 data_dir = os.path.join(_PROJECT_PATH, 'data')
 
+# Supported authentification
+authentifications = {
+    'saml2': 'mandaye.auth.saml2.SAML2Auth'
+}
+
+# sp mappers
+mappers = {
+    'linuxfr': 'rp_meyzieu.mappers.linuxfr_example',
+    'portail_famille_ecities': 'rp_meyzieu.mappers.portail_famille_ecities',
+}
+
+# Raven Sentry configuration
+raven_dsn = None
+
 # Email notification configuration
 email_notification = False
 email_prefix = '[Mandaye CAM]'
@@ -80,59 +130,6 @@ session_opts = {
 # Only mandaye.backends.sql at the moment
 storage_backend = "mandaye.backends.sql"
 
-# Needed if ssl is activated
-ssl = False
-keyfile = ''
-certfile = ''
-
-SAML_SIGNATURE_PUBLIC_KEY = '''-----BEGIN CERTIFICATE-----
-MIIDIzCCAgugAwIBAgIJANUBoick1pDpMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAoTCkVudHJvdXZlcnQwHhcNMTAxMjE0MTUzMzAyWhcNMTEwMTEzMTUzMzAyWjAV
-MRMwEQYDVQQKEwpFbnRyb3V2ZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvxFkfPdndlGgQPDZgFGXbrNAc/79PULZBuNdWFHDD9P5hNhZn9Kqm4Cp
-06Pe/A6u+g5wLnYvbZQcFCgfQAEzziJtb3J55OOlB7iMEI/T2AX2WzrUH8QT8NGh
-ABONKU2Gg4XiyeXNhH5R7zdHlUwcWq3ZwNbtbY0TVc+n665EbrfV/59xihSqsoFr
-kmBLH0CoepUXtAzA7WDYn8AzusIuMx3n8844pJwgxhTB7Gjuboptlz9Hri8JRdXi
-VT9OS9Wt69ubcNoM6zuKASmtm48UuGnhj8v6XwvbjKZrL9kA+xf8ziazZfvvw/VG
-Tm+IVFYB7d1x457jY5zjjXJvNysoowIDAQABo3YwdDAdBgNVHQ4EFgQUeF8ePnu0
-fcAK50iBQDgAhHkOu8kwRQYDVR0jBD4wPIAUeF8ePnu0fcAK50iBQDgAhHkOu8mh
-GaQXMBUxEzARBgNVBAoTCkVudHJvdXZlcnSCCQDVAaInJNaQ6TAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAy8l3GhUtpPHx0FxzbRHVaaUSgMwYKGPhE
-IdGhqekKUJIx8et4xpEMFBl5XQjBNq/mp5vO3SPb2h2PVSks7xWnG3cvEkqJSOeo
-fEEhkqnM45b2MH1S5uxp4i8UilPG6kmQiXU2rEUBdRk9xnRWos7epVivTSIv1Ncp
-lG6l41SXp6YgIb2ToT+rOKdIGIQuGDlzeR88fDxWEU0vEujZv/v1PE1YOV0xKjTT
-JumlBc6IViKhJeo1wiBBrVRIIkKKevHKQzteK8pWm9CYWculxT26TZ4VWzGbo06j
-o2zbumirrLLqnt1gmBDvDvlOwC/zAAyL4chbz66eQHTiIYZZvYgy
------END CERTIFICATE-----'''
-
-SAML_SIGNATURE_PRIVATE_KEY = '''-----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAvxFkfPdndlGgQPDZgFGXbrNAc/79PULZBuNdWFHDD9P5hNhZ
-n9Kqm4Cp06Pe/A6u+g5wLnYvbZQcFCgfQAEzziJtb3J55OOlB7iMEI/T2AX2WzrU
-H8QT8NGhABONKU2Gg4XiyeXNhH5R7zdHlUwcWq3ZwNbtbY0TVc+n665EbrfV/59x
-ihSqsoFrkmBLH0CoepUXtAzA7WDYn8AzusIuMx3n8844pJwgxhTB7Gjuboptlz9H
-ri8JRdXiVT9OS9Wt69ubcNoM6zuKASmtm48UuGnhj8v6XwvbjKZrL9kA+xf8ziaz
-Zfvvw/VGTm+IVFYB7d1x457jY5zjjXJvNysoowIDAQABAoIBAQCj8t2iKXya10HG
-V6Saaeih8aftoLBV38VwFqqjPU0+iKqDpk2JSXBhjI6s7uFIsaTNJpR2Ga1qvns1
-hJQEDMQSLhJvXfBgSkHylRWCpJentr4E3D7mnw5pRsd61Ev9U+uHcdv/WHP4K5hM
-xsdiwXNXD/RYd1Q1+6bKrCuvnNJVmWe0/RV+r3T8Ni5xdMVFbRWt/VEoE620XX6c
-a9TQPiA5i/LRVyie+js7Yv+hVjGOlArtuLs6ECQsivfPrqKLOBRWcofKdcf+4N2e
-3cieUqwzC15C31vcMliD9Hax9c1iuTt9Q3Xzo20fOSazAnQ5YBEExyTtrFBwbfQu
-ku6hp81pAoGBAN6bc6iJtk5ipYpsaY4ZlbqdjjG9KEXB6G1MExPU7SHXOhOF0cDH
-/pgMsv9hF2my863MowsOj3OryVhdQhwA6RrV263LRh+JU8NyHV71BwAIfI0BuVfj
-6r24KudwtUcvMr9pJIrJyMAMaw5ZyNoX7YqFpS6fcisSJYdSBSoxzrzVAoGBANu6
-xVeMqGavA/EHSOQP3ipDZ3mnWbkDUDxpNhgJG8Q6lZiwKwLoSceJ8z0PNY3VetGA
-RbqtqBGfR2mcxHyzeqVBpLnXZC4vs/Vy7lrzTiHDRZk2SG5EkHMSKFA53jN6S/nJ
-JWpYZC8lG8w4OHaUfDHFWbptxdGYCgY4//sjeiuXAoGBANuhurJ99R5PnA8AOgEW
-4zD1hLc0b4ir8fvshCIcAj9SUB20+afgayRv2ye3Dted1WkUL4WYPxccVhLWKITi
-rRtqB03o8m3pG3kJnUr0LIzu0px5J/o8iH3ZOJOTE3iBa+uI/KHmxygc2H+XPGFa
-HGeAxuJCNO2kAN0Losbnz5dlAoGAVsCn94gGWPxSjxA0PC7zpTYVnZdwOjbPr/pO
-LDE0cEY9GBq98JjrwEd77KibmVMm+Z4uaaT0jXiYhl8pyJ5IFwUS13juCbo1z/u/
-ldMoDvZ8/R/MexTA/1204u/mBecMJiO/jPw3GdIJ5phv2omHe1MSuSNsDfN8Sbap
-gmsgaiMCgYB/nrTk89Fp7050VKCNnIt1mHAcO9cBwDV8qrJ5O3rIVmrg1T6vn0aY
-wRiVcNacaP+BivkrMjr4BlsUM6yH4MOBsNhLURiiCL+tLJV7U0DWlCse/doWij4U
-TKX6tp6oI+7MIJE6ySZ0cBqOiydAkBePZhu57j6ToBkTa0dbHjn1WA==
------END RSA PRIVATE KEY-----'''
-
 # Import local config
 try:
     from cam.local_config import *

requirements.txt

@@ -1,3 +1,3 @@
 gunicorn>=0.13
 pycrypto>=2.0
-git+git://repos.entrouvert.org/mandaye.git
+mandaye>=0.8

setup.py

@@ -12,7 +12,7 @@ from sys import version
 
 install_requires=[
           'gunicorn>=0.13',
-          'mandaye>=0.7',
+          'mandaye>=0.8',
           'pycrypto>=2.0',
 ]