diff options
| author | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-21 21:13:46 +0000 |
|---|---|---|
| committer | bbryant <bbryant@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-21 21:13:46 +0000 |
| commit | 50823f69ae40e35ae43caac94c0e6710e57bdb01 (patch) | |
| tree | e5bc48ddc1a199700321e987b2fd24af1ded818c /configs | |
| parent | 3a1a47dfd69b3f3361e65f55874b870363d56401 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@132515 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/features.conf.sample | 15 | ||||
| -rw-r--r-- | configs/gtalk.conf.sample | 1 | ||||
| -rw-r--r-- | configs/jingle.conf.sample | 1 | ||||
| -rw-r--r-- | configs/manager.conf.sample | 1 |
4 files changed, 17 insertions, 1 deletions
diff --git a/configs/features.conf.sample b/configs/features.conf.sample index 3666e804b..b3dd4d549 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 da629b626..ad089b208 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 da629b626..ad089b208 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 410e459d2..0fd4ccbaa 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=<cipher string> ; string specifying which SSL ciphers to use or not use ; |