fix IPs, add some TELECASTER properties

diff --git a/example/settings.py b/example/settings.py
index 30b6f6ca0cf6913e9df3e690a80f1fe394d9b427..a8fb63659f8851effd382c76f5f2417cd7370ad8 100644 (file)
--- a/example/settings.py
+++ b/example/settings.py
@@ -185,7 +185,8 @@ EMAIL_SUBJECT_PREFIX = '[' + TELEMETA_ORGANIZATION.decode('utf8') + '] '
 
 POSTMAN_AUTO_MODERATE_AS = True
 
-#FILE_PROTECTION_METHOD = 'xsendfile'
+TELECASTER_CONF = [{'type':'mp3','server_type':'icecast','conf':'/etc/telecaster/deefuzzer_mp3.xml', 'port':'8000'},
+                   {'type':'webm','server_type':'stream-m','conf':'/etc/telecaster/deefuzzer_webm.xml', 'port':'8080'}, ]
 
-TELECASTER_CONF = [{'type':'mp3','conf':'/etc/telecaster/deefuzzer_mp3.xml', 'port':'8000'},
-                   {'type':'webm','conf':'/etc/telecaster/deefuzzer_webm.xml', 'port':'8080'}, ]
+TELECASTER_RSYNC_SERVER = 'telecaster@jimi.parisson.com:archives/'+TELEMETA_ORGANIZATION+'/'
+TELECASTER_RSYNC_LOG = '/var/log/telecaster/rsync.log'

diff --git a/teleforma/views.py b/teleforma/views.py
index 804e3fea8525ae30c42e10114db3887e84809216..706df8d9fe7c974244ab2548b1f6232707c254d8 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -363,9 +363,12 @@ class ConferenceRecordView(FormView):
 
     def get_context_data(self, **kwargs):
         context = super(ConferenceRecordView, self).get_context_data(**kwargs)
+        from telecaster.tools import *
         context['all_courses'] = get_courses(self.request.user)
         context['mime_type'] = 'video/webm'
-        context['host'] = get_host(self.request)
+        status = Status()
+        status.update()
+        context['host'] = status.ip
         context['hidden_fields'] = self.hidden_fields
         return context