From f7fa55eb283fd2c8c6cd8c8fe4255e57a3d4e5b9 Mon Sep 17 00:00:00 2001 From: Brett Bryant Date: Mon, 21 Jul 2008 21:13:46 +0000 Subject: [PATCH] Merged revisions 132514 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r132514 | bbryant | 2008-07-21 16:12:51 -0500 (Mon, 21 Jul 2008) | 8 lines Update configuration files to add missing options for jingle, gtalk, manager.conf, and features.conf. (closes issue #13128) Reported by: caio1982 Patches: missing_options1.diff uploaded by caio1982 (license 22) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@132515 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- configs/features.conf.sample | 15 ++++++++++++++- configs/gtalk.conf.sample | 1 + configs/jingle.conf.sample | 1 + configs/manager.conf.sample | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/configs/features.conf.sample b/configs/features.conf.sample index 3666e804b2..b3dd4d5491 100644 --- a/configs/features.conf.sample +++ b/configs/features.conf.sample @@ -7,9 +7,12 @@ parkext => 700 ; What extension to dial to park parkpos => 701-720 ; What extensions to park calls on. These needs to be ; numeric, as Asterisk starts from the start position ; and increments with one for the next parked call. -context => parkedcalls ; Which context parked calls are in +;parkinghints = no ; Add hints priorities automatically for parking slots (default is no). ;parkingtime => 45 ; Number of seconds a call can be parked for ; (default is 45 seconds) +;comebacktoorigin = yes ; Whether to return to the original calling extension upon parking + ; timeout or to send the call to context 'parkedcallstimeout' at + ; extension 's', priority '1' (default is yes). ;courtesytone = beep ; Sound file to play to the parked caller ; when someone dials a parked call ; or the Touch Monitor is activated/deactivated. @@ -108,6 +111,16 @@ context => parkedcalls ; Which context parked calls are in ;unpauseMonitor => #3,self/callee,UnPauseMonitor ;Allow the callee to unpause monitoring ; ;on their channel ; +;*** Define another parking lot +; +; You can set parkinglot with the CHANNEL dialplan function +; or by setting 'parkinglot' directly in the channel configuration file. +; +;[parkinglot_edvina] +;context => edvinapark +;parkpos => 800-850 +;findslot => next + ; GROUPS ; Groups are groupings of features defined in [applicationmap] ; that can have their own key mappings. diff --git a/configs/gtalk.conf.sample b/configs/gtalk.conf.sample index da629b6265..ad089b208c 100644 --- a/configs/gtalk.conf.sample +++ b/configs/gtalk.conf.sample @@ -1,5 +1,6 @@ ;[general] ;context=default ;;Context to dump call into +;bindaddr=0.0.0.0 ;;Address to bind to ;allowguest=yes ;;Allow calls from people not in ;;list of peers ; diff --git a/configs/jingle.conf.sample b/configs/jingle.conf.sample index da629b6265..ad089b208c 100644 --- a/configs/jingle.conf.sample +++ b/configs/jingle.conf.sample @@ -1,5 +1,6 @@ ;[general] ;context=default ;;Context to dump call into +;bindaddr=0.0.0.0 ;;Address to bind to ;allowguest=yes ;;Allow calls from people not in ;;list of peers ; diff --git a/configs/manager.conf.sample b/configs/manager.conf.sample index 410e459d2e..0fd4ccbaa6 100644 --- a/configs/manager.conf.sample +++ b/configs/manager.conf.sample @@ -43,6 +43,7 @@ bindaddr = 0.0.0.0 ; sslbindport=5039 ; the port to bind to ; sslbindaddr=0.0.0.0 ; address to bind to, default to bindaddr ; sslcert=/tmp/asterisk.pem ; path to the certificate. +; sslcipher= ; string specifying which SSL ciphers to use or not use ;