[svn-commits] bbryant: branch 1.6.0 r132515 - in /branches/1.6.0: ./ configs/

[SVN commits to the Digium repositories]

Author: bbryant
Date: Mon Jul 21 16:13:46 2008
New Revision: 132515

URL: http://svn.digium.com/view/asterisk?view=rev&rev=132515
Log:
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)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/features.conf.sample
    branches/1.6.0/configs/gtalk.conf.sample
    branches/1.6.0/configs/jingle.conf.sample
    branches/1.6.0/configs/manager.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/features.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/features.conf.sample?view=diff&rev=132515&r1=132514&r2=132515
==============================================================================
--- branches/1.6.0/configs/features.conf.sample (original)
+++ branches/1.6.0/configs/features.conf.sample Mon Jul 21 16:13:46 2008
@@ -7,9 +7,12 @@
 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 @@
 ;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.

Modified: branches/1.6.0/configs/gtalk.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/gtalk.conf.sample?view=diff&rev=132515&r1=132514&r2=132515
==============================================================================
--- branches/1.6.0/configs/gtalk.conf.sample (original)
+++ branches/1.6.0/configs/gtalk.conf.sample Mon Jul 21 16:13:46 2008
@@ -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
 ;

Modified: branches/1.6.0/configs/jingle.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/jingle.conf.sample?view=diff&rev=132515&r1=132514&r2=132515
==============================================================================
--- branches/1.6.0/configs/jingle.conf.sample (original)
+++ branches/1.6.0/configs/jingle.conf.sample Mon Jul 21 16:13:46 2008
@@ -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
 ;

Modified: branches/1.6.0/configs/manager.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/manager.conf.sample?view=diff&rev=132515&r1=132514&r2=132515
==============================================================================
--- branches/1.6.0/configs/manager.conf.sample (original)
+++ branches/1.6.0/configs/manager.conf.sample Mon Jul 21 16:13:46 2008
@@ -43,6 +43,7 @@
 ;   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
 
 
 ;