[Pkg-voip-commits] [janus] 01/01: Fix patch 2002 to expand recordingsdir variable.

Thu Mar 16 14:41:57 UTC 2017

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository janus.

commit b1853cdd947a0bfeaa2ab7b8e6cd24822cbd0564
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Mar 16 15:41:25 2017 +0100

    Fix patch 2002 to expand recordingsdir variable.
---
 debian/patches/2002_avoid_tmp.patch | 170 +++++++++++++++++++++++++++++++-----
 1 file changed, 150 insertions(+), 20 deletions(-)

diff --git a/debian/patches/2002_avoid_tmp.patch b/debian/patches/2002_avoid_tmp.patch
index 3f24ba7..114eecf 100644
--- a/debian/patches/2002_avoid_tmp.patch
+++ b/debian/patches/2002_avoid_tmp.patch
@@ -18,31 +18,83 @@ Last-Update: 2017-03-13
  ;interface = 1.2.3.4		; Interface to use (will be used in SDP)
  debug_level = 4				; Debug/logging level, valid values are 0-7
 --- a/conf/janus.plugin.audiobridge.cfg.sample
-+++ b/conf/janus.plugin.audiobridge.cfg.sample
-@@ -20,4 +20,4 @@
- secret = adminpwd
- sampling_rate = 16000
- record = false
++++ /dev/null
+@@ -1,23 +0,0 @@
+-; [<unique room ID>]
+-; description = This is my awesome room
+-; is_private = yes|no (whether this room should be in the public list, default=yes)
+-; secret = <optional password needed for manipulating (e.g. destroying) the room>
+-; pin = <optional password needed for joining the room>
+-; sampling_rate = <sampling rate> (e.g., 16000 for wideband mixing)
+-; audiolevel_ext = yes|no (whether the ssrc-audio-level RTP extension must
+-;		be negotiated/used or not for new joins, default=yes)
+-; record = true|false (whether this room should be recorded, default=false)
+-; record_file = /path/to/recording.wav (where to save the recording)
+-
+-[general]
+-;admin_key = supersecret		; If set, rooms can be created via API only
+-								; if this key is provided in the request
+-;events = no					; Whether events should be sent to event
+-								; handlers (default is yes)
+-
+-[1234]
+-description = Demo Room
+-secret = adminpwd
+-sampling_rate = 16000
+-record = false
 -;record_file = /tmp/janus-audioroom-1234.wav
-+;record_file = @recordingsdir@/audioroom-1234.wav
 --- a/conf/janus.plugin.videoroom.cfg.sample
-+++ b/conf/janus.plugin.videoroom.cfg.sample
-@@ -33,4 +33,4 @@
- ;audiocodec = opus
- ;videocodec = vp8
- record = false
++++ /dev/null
+@@ -1,36 +0,0 @@
+-; [<unique room ID>]
+-; description = This is my awesome room
+-; is_private = yes|no (whether this room should be in the public list, default=yes)
+-; secret = <optional password needed for manipulating (e.g. destroying) the room>
+-; pin = <optional password needed for joining the room>
+-; publishers = <max number of concurrent senders> (e.g., 6 for a video
+-;              conference or 1 for a webinar)
+-; bitrate = <max video bitrate for senders> (e.g., 128000)
+-; fir_freq = <send a FIR to publishers every fir_freq seconds> (0=disable)
+-; audiocodec = opus|isac32|isac16|pcmu|pcma (audio codec to force on publishers, default=opus)
+-; videocodec = vp8|vp9|h264 (video codec to force on publishers, default=vp8)
+-; audiolevel_ext = yes|no (whether the ssrc-audio-level RTP extension must
+-;		be negotiated/used or not for new publishers, default=yes)
+-; videoorient_ext = yes|no (whether the video-orientation RTP extension must
+-;		be negotiated/used or not for new publishers, default=yes)
+-; playoutdelay_ext = yes|no (whether the playout-delay RTP extension must
+-;		be negotiated/used or not for new publishers, default=yes)
+-; record = true|false (whether this room should be recorded, default=false)
+-; rec_dir = <folder where recordings should be stored, when enabled>
+-
+-[general]
+-;admin_key = supersecret		; If set, rooms can be created via API only
+-								; if this key is provided in the request
+-;events = no					; Whether events should be sent to event
+-								; handlers (default is yes)
+-
+-[1234]
+-description = Demo Room
+-secret = adminpwd
+-publishers = 6
+-bitrate = 128000
+-fir_freq = 10
+-;audiocodec = opus
+-;videocodec = vp8
+-record = false
 -;rec_dir = /tmp/janus-videoroom
-+;rec_dir = @recordingsdir@/janus-videoroom
 --- a/conf/janus.plugin.voicemail.cfg.sample
-+++ b/conf/janus.plugin.voicemail.cfg.sample
-@@ -5,6 +5,6 @@
- ; events = yes|no, whether events should be sent to event handlers
- 
- [general]
++++ /dev/null
+@@ -1,10 +0,0 @@
+-; path = where to place recordings in the file system (should be in a
+-;	properly configured web server, if you want the demo to work)
+-; base = base path to use when returning the recording URI (use this
+-;	to make sure the file in the path you chose is reachable via HTTP)
+-; events = yes|no, whether events should be sent to event handlers
+-
+-[general]
 -path = /tmp/voicemail/
-+path = @recordingsdir@/voicemail/
- base = /voicemail/
- events = yes
+-base = /voicemail/
+-events = yes
 --- a/conf/janus.transport.pfunix.cfg.sample
 +++ b/conf/janus.transport.pfunix.cfg.sample
 @@ -6,7 +6,7 @@
@@ -96,3 +148,81 @@ Last-Update: 2017-03-13
  			item = janus_config_get_item_drilldown(config, "admin", "admin_type");
  			const char *type = item && item->value ? item->value : "SOCK_SEQPACKET";
  			if(!strcasecmp(type, "SOCK_SEQPACKET")) {
+--- /dev/null
++++ b/conf/janus.plugin.audiobridge.cfg.sample.in
+@@ -0,0 +1,23 @@
++; [<unique room ID>]
++; description = This is my awesome room
++; is_private = yes|no (whether this room should be in the public list, default=yes)
++; secret = <optional password needed for manipulating (e.g. destroying) the room>
++; pin = <optional password needed for joining the room>
++; sampling_rate = <sampling rate> (e.g., 16000 for wideband mixing)
++; audiolevel_ext = yes|no (whether the ssrc-audio-level RTP extension must
++;		be negotiated/used or not for new joins, default=yes)
++; record = true|false (whether this room should be recorded, default=false)
++; record_file = /path/to/recording.wav (where to save the recording)
++
++[general]
++;admin_key = supersecret		; If set, rooms can be created via API only
++								; if this key is provided in the request
++;events = no					; Whether events should be sent to event
++								; handlers (default is yes)
++
++[1234]
++description = Demo Room
++secret = adminpwd
++sampling_rate = 16000
++record = false
++;record_file = @recordingsdir@/audioroom-1234.wav
+--- /dev/null
++++ b/conf/janus.plugin.videoroom.cfg.sample.in
+@@ -0,0 +1,36 @@
++; [<unique room ID>]
++; description = This is my awesome room
++; is_private = yes|no (whether this room should be in the public list, default=yes)
++; secret = <optional password needed for manipulating (e.g. destroying) the room>
++; pin = <optional password needed for joining the room>
++; publishers = <max number of concurrent senders> (e.g., 6 for a video
++;              conference or 1 for a webinar)
++; bitrate = <max video bitrate for senders> (e.g., 128000)
++; fir_freq = <send a FIR to publishers every fir_freq seconds> (0=disable)
++; audiocodec = opus|isac32|isac16|pcmu|pcma (audio codec to force on publishers, default=opus)
++; videocodec = vp8|vp9|h264 (video codec to force on publishers, default=vp8)
++; audiolevel_ext = yes|no (whether the ssrc-audio-level RTP extension must
++;		be negotiated/used or not for new publishers, default=yes)
++; videoorient_ext = yes|no (whether the video-orientation RTP extension must
++;		be negotiated/used or not for new publishers, default=yes)
++; playoutdelay_ext = yes|no (whether the playout-delay RTP extension must
++;		be negotiated/used or not for new publishers, default=yes)
++; record = true|false (whether this room should be recorded, default=false)
++; rec_dir = <folder where recordings should be stored, when enabled>
++
++[general]
++;admin_key = supersecret		; If set, rooms can be created via API only
++								; if this key is provided in the request
++;events = no					; Whether events should be sent to event
++								; handlers (default is yes)
++
++[1234]
++description = Demo Room
++secret = adminpwd
++publishers = 6
++bitrate = 128000
++fir_freq = 10
++;audiocodec = opus
++;videocodec = vp8
++record = false
++;rec_dir = @recordingsdir@/janus-videoroom
+--- /dev/null
++++ b/conf/janus.plugin.voicemail.cfg.sample.in
+@@ -0,0 +1,10 @@
++; path = where to place recordings in the file system (should be in a
++;	properly configured web server, if you want the demo to work)
++; base = base path to use when returning the recording URI (use this
++;	to make sure the file in the path you chose is reachable via HTTP)
++; events = yes|no, whether events should be sent to event handlers
++
++[general]
++path = @recordingsdir@/voicemail/
++base = /voicemail/
++events = yes

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git

