update live settings

diff --git a/app/settings.py b/app/settings.py
index 62a637f43ea1e88b703c19169517054126a223d3..cf4138faf6981c4b9551537e41f3579d9c340c72 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -268,10 +268,16 @@ 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_PROTOCOL = 'https'
+TELECASTER_LIVE_STREAMING_SERVER = 'stream7.parisson.com'
+TELECASTER_LIVE_STREAMING_SERVERS = ['jimmy.parisson.com', 'ron.parisson.com']
+TELECASTER_LIVE_RANDOM_SERVERS = True
 TELECASTER_LIVE_STREAMING_PORT = 443
-TELECASTER_LIVE_ICECAST_STREAMING_PORT = 8000
-TELECASTER_LIVE_STREAM_M_STREAMING_PORT = 8888
+TELECASTER_LIVE_ICECAST_STREAMING_PORT = 443
+TELECASTER_LIVE_ICECAST_STREAMING_PATH = '/stream/audio/'
+TELECASTER_LIVE_STREAM_M_STREAMING_PORT = 443
+TELECASTER_LIVE_STREAM_M_STREAMING_PATH = '/stream/video/'
+TELECASTER_LIVE_TWEETER = False
 
 # CRFPA or AE or PRO
 TELEFORMA_E_LEARNING_TYPE = 'AE'
@@ -293,11 +299,6 @@ TELEFORMA_REGISTER_COURSE_CHOICE = (28, 29, 30, 31)
 # courses added to all registered users
 TELEFORMA_REGISTER_COURSE_AUTOREGISTER = (27, 34, 35, 36, 37)
 
-TELECASTER_LIVE_STREAMING_SERVER = 'stream4.parisson.com'
-TELECASTER_LIVE_STREAMING_PORT = 443
-TELECASTER_LIVE_ICECAST_STREAMING_PORT = 8000
-TELECASTER_LIVE_STREAM_M_STREAMING_PORT = 8080
-
 PASSWORD_HASHERS = [
     'django.contrib.auth.hashers.PBKDF2PasswordHasher',
 ]