- minor cleanup

akka-bbb-apps/src/universal/conf/application.conf

@@ -1,95 +1,95 @@
-akka {
-  actor {
-    debug {
-      # enable DEBUG logging of all AutoReceiveMessages (Kill, PoisonPill et.c.)
-      autoreceive = on
-      # enable DEBUG logging of actor lifecycle changes
-      lifecycle = on
-    }
-  }
-  loggers = ["akka.event.slf4j.Slf4jLogger"]
-  loglevel = "DEBUG"
-  
-  redis-publish-worker-dispatcher {
-      mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
-      # Throughput defines the maximum number of messages to be
-      # processed per actor before the thread jumps to the next actor.
-      # Set to 1 for as fair as possible.
-      throughput = 512
-    }
-    
-  redis-subscriber-worker-dispatcher {
-      mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
-      # Throughput defines the maximum number of messages to be
-      # processed per actor before the thread jumps to the next actor.
-      # Set to 1 for as fair as possible.
-      throughput = 512
-    }
-}
-
-redis {
-    host="127.0.0.1"
-    port=6379
-    password="foobared2"
-    # recording keys should expire in 14 days
-    keyExpiry=1209600
-}
-
-expire {
-  # time in seconds
-  lastUserLeft = 60
-  neverJoined = 300
-  maxRegUserToJoin = 300
-}
-
-services {
-  bbbWebAPI = "http://192.168.23.33/bigbluebutton/api"
-  sharedSecret = "changeme"
-}
-
-red5 {
-    deskshareip="10.130.218.89"
-    deskshareapp="video-broadcast"
-}
-
-eventBus {
-  meetingManagerChannel = "MeetingManagerChannel"
-  outMessageChannel = "OutgoingMessageChannel"
-  incomingJsonMsgChannel = "IncomingJsonMsgChannel"
-  outBbbMsgMsgChannel = "OutBbbMsgChannel"
-}
-
-sharedNotes {
-  maxNumberOfNotes = 3
-  maxNumberOfUndos = 30
-}
-
-http {
-  interface = "0.0.0.0"
-  port = 9999
-}
-
-services {
-  telizeHost = "www.telize.com"
-  telizePort = 80
-}
-
-apps {
-  checkPermissions = true
-  endMeetingWhenNoMoreAuthedUsers = false
-  endMeetingWhenNoMoreAuthedUsersAfterMinutes = 2
-}
-
-voiceConf {
-  recordPath = "/var/freeswitch/meetings"
-}
-
-recording {
-  # set zero to disable chapter break
-  chapterBreakLengthInMinutes = 0
-}
-
-whiteboard {
-  multiUserDefault = false
-}
-
+akka {
+  actor {
+    debug {
+      # enable DEBUG logging of all AutoReceiveMessages (Kill, PoisonPill et.c.)
+      autoreceive = on
+      # enable DEBUG logging of actor lifecycle changes
+      lifecycle = on
+    }
+  }
+  loggers = ["akka.event.slf4j.Slf4jLogger"]
+  loglevel = "DEBUG"
+  
+  redis-publish-worker-dispatcher {
+      mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
+      # Throughput defines the maximum number of messages to be
+      # processed per actor before the thread jumps to the next actor.
+      # Set to 1 for as fair as possible.
+      throughput = 512
+    }
+    
+  redis-subscriber-worker-dispatcher {
+      mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
+      # Throughput defines the maximum number of messages to be
+      # processed per actor before the thread jumps to the next actor.
+      # Set to 1 for as fair as possible.
+      throughput = 512
+    }
+}
+
+redis {
+    host="127.0.0.1"
+    port=6379
+    password=""
+    # recording keys should expire in 14 days
+    keyExpiry=1209600
+}
+
+expire {
+  # time in seconds
+  lastUserLeft = 60
+  neverJoined = 300
+  maxRegUserToJoin = 300
+}
+
+services {
+  bbbWebAPI = "http://192.168.23.33/bigbluebutton/api"
+  sharedSecret = "changeme"
+}
+
+red5 {
+    deskshareip="10.130.218.89"
+    deskshareapp="video-broadcast"
+}
+
+eventBus {
+  meetingManagerChannel = "MeetingManagerChannel"
+  outMessageChannel = "OutgoingMessageChannel"
+  incomingJsonMsgChannel = "IncomingJsonMsgChannel"
+  outBbbMsgMsgChannel = "OutBbbMsgChannel"
+}
+
+sharedNotes {
+  maxNumberOfNotes = 3
+  maxNumberOfUndos = 30
+}
+
+http {
+  interface = "0.0.0.0"
+  port = 9999
+}
+
+services {
+  telizeHost = "www.telize.com"
+  telizePort = 80
+}
+
+apps {
+  checkPermissions = true
+  endMeetingWhenNoMoreAuthedUsers = false
+  endMeetingWhenNoMoreAuthedUsersAfterMinutes = 2
+}
+
+voiceConf {
+  recordPath = "/var/freeswitch/meetings"
+}
+
+recording {
+  # set zero to disable chapter break
+  chapterBreakLengthInMinutes = 0
+}
+
+whiteboard {
+  multiUserDefault = false
+}
+

akka-bbb-fsesl/src/universal/conf/application.conf

@@ -1,39 +1,39 @@
-akka {
-  actor {
-    debug {
-      receive = on
-    }
-  }
-  loggers = ["akka.event.slf4j.Slf4jLogger"]
-  loglevel = "DEBUG"
-  stdout-loglevel = "DEBUG"
-  
-    redis-subscriber-worker-dispatcher {
-      mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
-      # Throughput defines the maximum number of messages to be
-      # processed per actor before the thread jumps to the next actor.
-      # Set to 1 for as fair as possible.
-      throughput = 512
-    }
-}
-
-
-freeswitch {
-    esl {
-        host="127.0.0.1"
-        port=8021
-        password="ClueCon"
-    }
-    conf {
-    	profile="cdquality"
-    }
-}
-
-redis {
-  host="127.0.0.1"
-  port=6379
-  password="foobared2"
-  # recording keys should expire in 14 days
-  keyExpiry=1209600
-}
-
+akka {
+  actor {
+    debug {
+      receive = on
+    }
+  }
+  loggers = ["akka.event.slf4j.Slf4jLogger"]
+  loglevel = "DEBUG"
+  stdout-loglevel = "DEBUG"
+  
+    redis-subscriber-worker-dispatcher {
+      mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
+      # Throughput defines the maximum number of messages to be
+      # processed per actor before the thread jumps to the next actor.
+      # Set to 1 for as fair as possible.
+      throughput = 512
+    }
+}
+
+
+freeswitch {
+    esl {
+        host="127.0.0.1"
+        port=8021
+        password="ClueCon"
+    }
+    conf {
+    	profile="cdquality"
+    }
+}
+
+redis {
+  host="127.0.0.1"
+  port=6379
+  password=""
+  # recording keys should expire in 14 days
+  keyExpiry=1209600
+}
+

bbb-screenshare/app/src/main/webapp/WEB-INF/screenshare.properties

@@ -1,31 +1,31 @@
-#
-# NOTE: default properties.
-#
-# NOTE!!!! NOTE!!!! NOTE!!!! NOTE!!!! NOTE!!!!
-# When making changes that you don't want checked-in, do
-#   git update-index --assume-unchanged <file>
-#
-# To have git track the changes again
-# 	git update-index --no-assume-unchanged <file>
-#
-
-recordingDirectory=/usr/share/red5/webapps/screenshare/streams
-
-redis.host=127.0.0.1
-redis.port=6379
-redis.password=foobared2
-redis.keyExpiry=1209600
-
-streamBaseUrl=rtmp://ritz-20.blindside-dev.com/screenshare
-jnlpUrl=https://ritz-20.blindside-dev.com/screenshare
-jnlpFile=https://ritz-20.blindside-dev.com/screenshare/screenshare.jnlp
-useH264=false
-
-# NOTES:
-# 1. GOP (group of pictures) is calculated as frameRate * keyFrameInterval
-# 2. intra-refresh=1 doesn't work in Chrome. Late comers can't view the stream as 
-#    the user missed the key frame
-# 3. keyFrameInterval is in seconds
-# 4. Make sure you encode & into &amp; as it will break the JNLP XML
-#codecOptions=crf=36&amp;preset=veryfast&amp;tune=animation,zerolatency&amp;frameRate=12.0&amp;keyFrameInterval=6
-codecOptions=crf=38&amp;preset=veryfast&amp;tune=zerolatency&amp;frameRate=5.0&amp;keyFrameInterval=5
+#
+# NOTE: default properties.
+#
+# NOTE!!!! NOTE!!!! NOTE!!!! NOTE!!!! NOTE!!!!
+# When making changes that you don't want checked-in, do
+#   git update-index --assume-unchanged <file>
+#
+# To have git track the changes again
+# 	git update-index --no-assume-unchanged <file>
+#
+
+recordingDirectory=/usr/share/red5/webapps/screenshare/streams
+
+redis.host=127.0.0.1
+redis.port=6379
+redis.password=
+redis.keyExpiry=1209600
+
+streamBaseUrl=rtmp://10.130.218.38/screenshare
+jnlpUrl=http://10.130.218.38/screenshare
+jnlpFile=http://10.130.218.38/screenshare/screenshare.jnlp
+useH264=false
+
+# NOTES:
+# 1. GOP (group of pictures) is calculated as frameRate * keyFrameInterval
+# 2. intra-refresh=1 doesn't work in Chrome. Late comers can't view the stream as 
+#    the user missed the key frame
+# 3. keyFrameInterval is in seconds
+# 4. Make sure you encode & into &amp; as it will break the JNLP XML
+#codecOptions=crf=36&amp;preset=veryfast&amp;tune=animation,zerolatency&amp;frameRate=12.0&amp;keyFrameInterval=6
+codecOptions=crf=38&amp;preset=veryfast&amp;tune=zerolatency&amp;frameRate=5.0&amp;keyFrameInterval=5

bigbluebutton-apps/src/main/webapp/WEB-INF/bigbluebutton.properties

@@ -21,7 +21,7 @@ default.BigBlueButtonDirectory=/var/bigbluebutton
 
 redisHost=127.0.0.1
 redisPort=6379
-redisPassword=foobared2
+redisPassword=
 redisExpireKey=1209600
 
 # Maximum message length allowed from the client.

bigbluebutton-web/grails-app/conf/application.conf

@@ -1,43 +1,43 @@
-akka {
-  actor {
-    debug {
-      # enable DEBUG logging of all AutoReceiveMessages (Kill, PoisonPill et.c.)
-      autoreceive = on
-      # enable DEBUG logging of actor lifecycle changes
-      lifecycle = on
-    }
-  }
-  loggers = ["akka.event.slf4j.Slf4jLogger"]
-  loglevel = "DEBUG"
-
-  redis-publish-worker-dispatcher {
-    mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
-    # Throughput defines the maximum number of messages to be
-    # processed per actor before the thread jumps to the next actor.
-    # Set to 1 for as fair as possible.
-    throughput = 512
-  }
-
-  redis-subscriber-worker-dispatcher {
-    mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
-    # Throughput defines the maximum number of messages to be
-    # processed per actor before the thread jumps to the next actor.
-    # Set to 1 for as fair as possible.
-    throughput = 512
-  }
-}
-
-redis {
-  host="127.0.0.1"
-  port=6379
-  password="foobared2"
-  # recording keys should expire in 14 days
-  keyExpiry=1209600
-}
-
-eventBus {
-  meetingManagerChannel = "MeetingManagerChannel"
-  outMessageChannel = "OutgoingMessageChannel"
-  incomingJsonMsgChannel = "IncomingJsonMsgChannel"
-  outBbbMsgMsgChannel = "OutBbbMsgChannel"
-}
+akka {
+  actor {
+    debug {
+      # enable DEBUG logging of all AutoReceiveMessages (Kill, PoisonPill et.c.)
+      autoreceive = on
+      # enable DEBUG logging of actor lifecycle changes
+      lifecycle = on
+    }
+  }
+  loggers = ["akka.event.slf4j.Slf4jLogger"]
+  loglevel = "DEBUG"
+
+  redis-publish-worker-dispatcher {
+    mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
+    # Throughput defines the maximum number of messages to be
+    # processed per actor before the thread jumps to the next actor.
+    # Set to 1 for as fair as possible.
+    throughput = 512
+  }
+
+  redis-subscriber-worker-dispatcher {
+    mailbox-type = "akka.dispatch.SingleConsumerOnlyUnboundedMailbox"
+    # Throughput defines the maximum number of messages to be
+    # processed per actor before the thread jumps to the next actor.
+    # Set to 1 for as fair as possible.
+    throughput = 512
+  }
+}
+
+redis {
+  host="127.0.0.1"
+  port=6379
+  password=""
+  # recording keys should expire in 14 days
+  keyExpiry=1209600
+}
+
+eventBus {
+  meetingManagerChannel = "MeetingManagerChannel"
+  outMessageChannel = "OutgoingMessageChannel"
+  incomingJsonMsgChannel = "IncomingJsonMsgChannel"
+  outBbbMsgMsgChannel = "OutBbbMsgChannel"
+}

bigbluebutton-web/grails-app/conf/bigbluebutton.properties

@@ -244,7 +244,7 @@ recordStatusDir=/var/bigbluebutton/recording/status/recorded
 
 redisHost=127.0.0.1
 redisPort=6379
-redisPassword=foobared2
+redisPassword=
 redisKeyExpiry=1209600
 
 # The directory where the published/unpublised recordings are located. This is for

record-and-playback/core/lib/recordandplayback/events_archiver.rb

@@ -1,4 +1,4 @@
-  # Set encoding to utf-8
+# Set encoding to utf-8
 # encoding: UTF-8
 
 #