# HG changeset patch
# User cavaliet
# Date 1396024389 -3600
# Node ID 2f94bf8c3a4c8ddac4fc7cd4b2b69b9b4e10ae5e
# Parent  fb044df234517c6c20240e6d3885cb9d277840fc# Parent  78ff82803e4a5eec669a74f9ef782654ec23467f
Merge with 78ff82803e4a5eec669a74f9ef782654ec23467f

diff -r fb044df23451 -r 2f94bf8c3a4c .hgtags
--- a/.hgtags	Fri Mar 28 17:30:49 2014 +0100
+++ b/.hgtags	Fri Mar 28 17:33:09 2014 +0100
@@ -8,3 +8,9 @@
 0000000000000000000000000000000000000000 V00.04.01
 38df204b8f36c0e4bba9a927a78b521d11ce35a2 V00.04.01
 5a8a9ab4ff51245ac8016010a80e77fe993ca152 V00.05
+de5509696851e04724f9761dac5c256c41a1ec70 V00.04.02
+422b7d138196848f7ae9ab96838e12b1f15943ad V00.09.00
+422b7d138196848f7ae9ab96838e12b1f15943ad V00.09.00
+0000000000000000000000000000000000000000 V00.09.00
+de5509696851e04724f9761dac5c256c41a1ec70 V00.04.02
+9bd682e9748823bea5018d9515c7b94dd7f3a04b V00.04.02
diff -r fb044df23451 -r 2f94bf8c3a4c sbin/sync/config.py.tmpl
--- a/sbin/sync/config.py.tmpl	Fri Mar 28 17:30:49 2014 +0100
+++ b/sbin/sync/config.py.tmpl	Fri Mar 28 17:33:09 2014 +0100
@@ -43,14 +43,24 @@
         'db_engine':'postgresql_psycopg2',
         'db_name':'spel',
         'db_user': 'iri',
-        'db_password': '',
+        'db_password': '', 
         'db_host': 'localhost',
         'db_port': 5432,
         'haystack_url' : 'http://localhost:9200',
         'haystack_index' : 'spel',
         'log_file' : '/var/log/www/spel/spel.log',
-        'secret_key' : ''.join([choice('abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)') for i in range(50)]), 
-    },
+        'secret_key' : ''.join([choice('abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)') for i in range(50)]),
+        'stream_url' : 'http://spectacleenlignes.fr/',
+        'stream_src_prefix' : '', 
+        'ffmpeg_path': '', 
+        'google_analytics_code': '', 
+        'email_use_tls' : 'True',
+        'email_host' : '', 
+        'email_host_user' : '', 
+        'email_port' : '', 
+        'forbidden_stream_url' : '', 
+        'audio_record_url' : ''
+    },  
 }
 
 env.check_folder_access = True
diff -r fb044df23451 -r 2f94bf8c3a4c src/spel/django_wsgi.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/spel/django_wsgi.py	Fri Mar 28 17:33:09 2014 +0100
@@ -0,0 +1,11 @@
+import os
+
+os.environ['DJANGO_SETTINGS_MODULE'] = 'spel.settings'
+ 
+import django.core.handlers.wsgi
+
+application = django.core.handlers.wsgi.WSGIHandler()
+
+if os.environ.get('PYDEV_DEBUG', "False").lower() in ["true", "1", "t"]:
+    import pydevd #@UnresolvedImport
+    pydevd.settrace(suspend=False)
diff -r fb044df23451 -r 2f94bf8c3a4c virtualenv/web/res/srvr_requirements.txt
--- a/virtualenv/web/res/srvr_requirements.txt	Fri Mar 28 17:30:49 2014 +0100
+++ b/virtualenv/web/res/srvr_requirements.txt	Fri Mar 28 17:33:09 2014 +0100
@@ -1,3 +1,3 @@
-python-memcached
+pylibmc
 uWSGI
 pytz