OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Mar-2008 21:07:12
Branch: HEAD Handle: 2008032320071200
Modified files:
openpkg-src/asterisk asterisk.txt
Log:
a larger bunch of voicemail and SIP user config related cleanups and
improvements
Summary:
Revision Changes Path
1.42 +44 -39 openpkg-src/asterisk/asterisk.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.txt
============================================================================
$ cvs diff -u -r1.41 -r1.42 asterisk.txt
--- openpkg-src/asterisk/asterisk.txt 23 Mar 2008 10:47:39 -0000 1.41
+++ openpkg-src/asterisk/asterisk.txt 23 Mar 2008 20:07:12 -0000 1.42
@@ -185,39 +185,36 @@
;context = external
;nat = no
-[foo]
+[std-user](!)
type = friend
-defaultuser = foo
-callerid = "Mr. Foo" <foo>
-fromdomain = example.com
-secret = asterisk
+context = internal
host = dynamic
-disallow = all
-allow = speex
-allow = g726
-allow = ulaw
-allow = alaw
dtmfmode = rfc2833
qualify = yes
-context = internal
-nat = no
-
-[bar]
-type = friend
-defaultuser = bar
-callerid = "Mr. Bar" <bar>
-fromdomain = example.com
-secret = asterisk
-host = dynamic
disallow = all
allow = speex
allow = g726
allow = ulaw
allow = alaw
-dtmfmode = rfc2833
-qualify = yes
-context = internal
-nat = no
+
+[behind-nat](!)
+nat = yes
+
+[with-mailbox](!)
+hasvoicemail = yes
+subscribemwi = yes
+subscribecontext = internal
+vmexten = voicemail
+
+[foo](std-user,with-mailbox)
+secret = asterisk
+callerid = "Mr. Foo" <11>
+mailbox = [EMAIL PROTECTED]
+
+[bar](std-user,with-mailbox)
+secret = asterisk
+callerid = "Mr. Bar" <12>
+mailbox = [EMAIL PROTECTED]
</file>
<file name="rtp.conf">
@@ -251,15 +248,17 @@
;;
[macro-dial]
-exten = s,1,Dial(${ARG1},${ARG2},j${ARG3})
+exten = s,1,Dial(${ARG1},${ARG2},${ARG3})
exten = s,n,Goto(s-${DIALSTATUS},1)
-exten = s-BUSY,1,Voicemail(u${ARG1})
-exten = s-BUSY,2,Busy
-exten = s-CONGESTION,1,Busy
-exten = s-CANCEL,1,Busy
exten = s-ANSWER,1,Hangup
-exten = s-NOANSWER,1,Hangup
-exten = s-CHANUNAVAIL,1,Hangup
+exten = s-BUSY,1,GotoIf($["${ARG4}" == ""]?novm)
+exten = s-BUSY,n,VoiceMail(${ARG4},b)
+exten = s-BUSY,n,Playback(vm-goodbye)
+exten = s-BUSY,n(novm),Hangup
+exten = s-NOANSWER,1,GotoIf($["${ARG4}" == ""]?novm)
+exten = s-NOANSWER,n,VoiceMail(${ARG4},u)
+exten = s-NOANSWER,n,Playback(vm-goodbye)
+exten = s-NOANSWER,n(novm),Hangup
exten = _s-.,1,Goto(s-NOANSWER,1)
[default]
@@ -278,7 +277,7 @@
exten = s,n,Ringing
exten = s,n,Wait(1)
exten = s,n,Answer
-exten = s,n,Macro(dial,${STAFF},30,gTtr)
+exten = s,n,Macro(dial,${STAFF},30,gTtr,[EMAIL PROTECTED])
; external to internal mapping
exten = foo,hint,SIP/foo
@@ -301,18 +300,18 @@
exten = foo,hint,SIP/foo
exten = foo,1,Goto(11,1)
exten = 11,hint,SIP/foo
-exten = 11,1,Macro(dial,SIP/foo,30,gTtr)
+exten = 11,1,Macro(dial,SIP/foo,30,gTtr,[EMAIL PROTECTED])
; internal user <bar> #12
exten = bar,hint,SIP/bar
exten = bar,1,Goto(12,1)
exten = 12,hint,SIP/bar
-exten = 12,1,Macro(dial,SIP/bar,30,gTtr)
+exten = 12,1,Macro(dial,SIP/bar,30,gTtr,[EMAIL PROTECTED])
; internal group <all> #20
exten = all,1,Goto(20,1)
-exten = 20/foo,1,Macro(dial,SIP/bar,60)
-exten = 20/bar,1,Macro(dial,SIP/foo,60)
+exten = 20/foo,1,Macro(dial,SIP/bar,60,)
+exten = 20/bar,1,Macro(dial,SIP/foo,60,)
; internal service <conference> #7<n>
exten = conference,1,Goto(70,1)
@@ -343,9 +342,9 @@
; internal service <voicemail> #80/#*<n>
exten = voicemail,1,Goto(80,1)
-exten = 80,1,VoicemailMain(s${CALLERIDNUM})
+exten = 80,1,VoiceMailMain(${CALLERID(num)[EMAIL PROTECTED],s)
exten = 80,n,Hangup
-exten = _*XX,1,Voicemail(u${EXTEN:1})
+exten = _*XX,1,VoiceMail(${EXTEN:[EMAIL PROTECTED],u)
exten = _*XX,n,Hangup
; internal service <echo> #81
@@ -449,7 +448,13 @@
mailcmd = @l_prefix@/sbin/sendmail -t
[default]
-1 = 1,Example,[EMAIL PROTECTED],,|delete=yes
+
+[external]
+1 = 1234,Example,[EMAIL PROTECTED],,delete=yes
+
+[internal]
+11 = 1234,Mr. Foo,[EMAIL PROTECTED],,delete=no
+12 = 1234,Mr. Bar,[EMAIL PROTECTED],,delete=no
</file>
<file name="cdr.conf">
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
