[svn-commits] tilghman: branch 1.6.0 r110692 - in /branches/1.6.0: ./ configs/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Mar 25 12:47:41 2008
New Revision: 110692

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110692
Log:
Merged revisions 110691 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r110691 | tilghman | 2008-03-25 12:46:34 -0500 (Tue, 25 Mar 2008) | 6 lines

Update sample configurations to make virtual hosting more obvious.
(closes issue #11969)
 Reported by: pprindeville
 Patches: 
       acme-virtualpbx.1.6.patch uploaded by pprindeville (license 347)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/extensions.conf.sample
    branches/1.6.0/configs/voicemail.conf.sample

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

Modified: branches/1.6.0/configs/extensions.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/extensions.conf.sample?view=diff&rev=110692&r1=110691&r2=110692
==============================================================================
--- branches/1.6.0/configs/extensions.conf.sample (original)
+++ branches/1.6.0/configs/extensions.conf.sample Tue Mar 25 12:47:41 2008
@@ -646,6 +646,56 @@
 ;
 ;exten = 8700,1,Dial(${MARK},30,A(/path/to/my/announcemsg))
 ;
+
+; example of a compartmentalized company called "acme"
+;
+; this is the context that your incoming IAX/SIP trunk dumps you in...
+;[acme-incoming]
+;exten => s,1,Wait(1)
+;exten => s,n,Answer()
+;exten => s,n(menu),Playback(acme/vm-brief-menu)
+;exten => s,n(exten),Background(vm-enter-num-to-call)
+;exten => s,n,WaitExten(5)
+;exten => s,n(goodbye),Playback(vm-goodbye)
+;exten => s,n(end),Hangup()
+;
+;include  => acme-extens
+;
+;exten => i,1,Playback(vm-invalid)
+;exten => i,n,Goto(s,exten)			; optionally, transfer to operator
+;
+;exten => t,1,Goto(s,goodbye)
+;
+; this is the context our internal SIP hardphones use (see sip.conf)
+;
+;[acme-internal]
+;exten => s,1,Answer()
+;exten => s,n(exten),Background(vm-enter-num-to-call)
+;exten => s,n,WaitExten(5)
+;exten => s,n(goodbye),Playback(vm-goodbye)
+;exten => s,n(end),Hangup()
+;
+;include => trunkint
+;include => trunkld
+;include => trunklocal
+;
+;include => acme-extens
+;
+; you can test what your system sounds like to outside callers by dialing this
+;exten => 777,1,DISA(no-password,acme-incoming)
+;
+; grouping of acme's extensions... never used directly, always included.
+;
+;[acme-extens]
+;exten => 111,1,Gosub(stdexten,s,1(111,SIP/pete_1,acme))
+;exten => 111,n,Goto(s,exten)
+;
+;exten => 112,1,Gosub(stdexten,s,1(112,SIP/nancy_1,acme))
+;exten => 112,n,Goto(s,end)
+;
+; end of acme example
+
+
 ; For more information on applications, just type "core show applications" at your
 ; friendly Asterisk CLI prompt.
 ;

Modified: branches/1.6.0/configs/voicemail.conf.sample
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configs/voicemail.conf.sample?view=diff&rev=110692&r1=110691&r2=110692
==============================================================================
--- branches/1.6.0/configs/voicemail.conf.sample (original)
+++ branches/1.6.0/configs/voicemail.conf.sample Tue Mar 25 12:47:41 2008
@@ -305,3 +305,13 @@
 ;The intro can be customized on a per-context basis
 ;directoryintro=dir-company2
 1234 => 5678,Company2 User,root at localhost
+
+; example for our acme compartmentalized company
+;
+; Pete telecommutes from Chicago, so we'll customize timestamps for him.
+;
+;[acme]
+;tz=eastern
+;111 => 7383,Pete,pete at acme-widgets.com,,tz=central
+;112 => 6262,Nancy,nancy at acme-widgets.com
+;