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 6e833891fe9f37cbfea2afd9a56aeee9707a53ce..13674193932843cb06be6a36af7284edd890758d 100644 (file)
--- 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 da629b6265cf618aea426f1aa7018a6f78408750..ad089b208cb764fd48558542d071590c77813c38 100644 (file)
--- 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 da629b6265cf618aea426f1aa7018a6f78408750..ad089b208cb764fd48558542d071590c77813c38 100644 (file)
--- 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 410e459d2e673dbc499aa58d4509e2ee28713e8e..0fd4ccbaa6076a311f46edefb5787321ece86fb9 100644 (file)
--- 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
 
 
 ;