From: Brett Bryant Date: Mon, 21 Jul 2008 21:12:51 +0000 (+0000) Subject: Update configuration files to add missing options for jingle, gtalk, X-Git-Tag: 1.6.2.0-beta1~1626 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea6f754d4d47a068f25d0e038226f2c3af9e2a3d;p=thirdparty%2Fasterisk.git 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/trunk@132514 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/features.conf.sample b/configs/features.conf.sample index 6e833891fe..1367419393 100644 --- a/configs/features.conf.sample +++ b/configs/features.conf.sample @@ -8,9 +8,12 @@ parkpos => 701-720 ; What extensions to park calls on. (defafult parking lot) ; 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 (default parking lot) -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. @@ -114,7 +117,7 @@ context => parkedcalls ; Which context parked calls are in ;*** Define another parking lot ; ; You can set parkinglot with the CHANNEL dialplan function -; or configure it in the device configuration in the channel +; or by setting 'parkinglot' directly in the channel configuration file. ; ;[parkinglot_edvina] ;context => edvinapark 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 ;