automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@36283 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-06-29 08:04:58 +00:00
parent d7b1425124
commit 402cef20d8
2 changed files with 9 additions and 7 deletions
+2 -2
View File
@@ -3,8 +3,8 @@
; Global settings for call queues
;
; Persistent Members
; Store each dynamic agent in each queue in the astdb so that
; when asterisk is restarted, each agent will be automatically
; Store each dynamic member in each queue in the astdb so that
; when asterisk is restarted, each member will be automatically
; readded into their recorded queues. Default is 'yes'.
;
persistentmembers = yes
+7 -5
View File
@@ -308,6 +308,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
; rtptimeout
; rtpholdtimeout
; sendrpid
; outboundproxy
;[sip_proxy]
; For incoming calls only. Example: FWD (Free World Dialup)
@@ -318,14 +319,15 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls
;host=fwd.pulver.com
;[sip_proxy-out]
;type=peer ; we only want to call out, not be called
;type=peer ; we only want to call out, not be called
;secret=guessit
;username=yourusername ; Authentication user for outbound proxies
;fromuser=yourusername ; Many SIP providers require this!
;username=yourusername ; Authentication user for outbound proxies
;fromuser=yourusername ; Many SIP providers require this!
;fromdomain=provider.sip.domain
;host=box.provider.com
;usereqphone=yes ; This provider requires ";user=phone" on URI
;call-limit=5 ; permit only 5 simultaneous outgoing calls to this peer
;usereqphone=yes ; This provider requires ";user=phone" on URI
;call-limit=5 ; permit only 5 simultaneous outgoing calls to this peer
;outboundproxy=proxy.provider.domain ; send outbound signaling to this proxy, not directly to the peer
;------------------------------------------------------------------------------
; Definitions of locally connected SIP phones