]> git.parisson.com Git - teleforma.git/commitdiff
Bugfix
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 12 Mar 2019 21:27:33 +0000 (22:27 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Tue, 12 Mar 2019 21:27:33 +0000 (22:27 +0100)
app/settings.py
teleforma/models/core.py

index 6ef819925e6b53b235ac6cbc9cef7cf6971d74a8..caf0cdd924989bfb5f1f851d59fb9d41bc5e2c01 100644 (file)
@@ -193,6 +193,11 @@ TELECASTER_RSYNC_SERVER = 'telecaster@jimi.parisson.com:archives/'
 TELECASTER_RSYNC_LOG = '/var/log/telecaster/rsync.log'
 TELECASTER_MASTER_SERVER = 'angus.parisson.com'
 
+TELECASTER_LIVE_STREAMING_SERVER = 'stream.parisson.com'
+TELECASTER_LIVE_STREAMING_PORT = 443
+TELECASTER_LIVE_ICECAST_STREAMING_PORT = 8000
+TELECASTER_LIVE_STREAM_M_STREAMING_PORT = 8888
+
 # CRFPA or AE or PRO
 TELEFORMA_E_LEARNING_TYPE = 'CRFPA'
 TELEFORMA_GLOBAL_TWEETER = False
index b8ad93a8ae8c0311f715a43608894893b23c7b49..123d6918a614537a4699e470bd26f1b5f6a35424 100644 (file)
@@ -500,6 +500,7 @@ class LiveStream(Model):
     @property
     def mount_point(self):
         # mount_point = self.server.type
+        mount_point = ''
         if self.server.type == 'stream-m':
             mount_point += '/consume/' + self.slug
         else: