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: 08-Sep-2006 08:19:23
Branch: HEAD Handle: 2006090807192201
Modified files:
openpkg-src/asterisk asterisk.spec asterisk.txt
Log:
cleanup and improve default configuration according to my
rediscoveries during my latest Asterisk fiddling
Summary:
Revision Changes Path
1.6 +1 -1 openpkg-src/asterisk/asterisk.spec
1.5 +21 -18 openpkg-src/asterisk/asterisk.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.spec
============================================================================
$ cvs diff -u -r1.5 -r1.6 asterisk.spec
--- openpkg-src/asterisk/asterisk.spec 6 Sep 2006 06:38:31 -0000
1.5
+++ openpkg-src/asterisk/asterisk.spec 8 Sep 2006 06:19:22 -0000
1.6
@@ -40,7 +40,7 @@
Group: Network
License: GPL
Version: %{V_asterisk}
-Release: 20060906
+Release: 20060908
# list of sources
Source0:
ftp://ftp.digium.com/pub/asterisk/releases/asterisk-%{V_asterisk}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/asterisk/asterisk.txt
============================================================================
$ cvs diff -u -r1.4 -r1.5 asterisk.txt
--- openpkg-src/asterisk/asterisk.txt 6 Sep 2006 06:38:31 -0000 1.4
+++ openpkg-src/asterisk/asterisk.txt 8 Sep 2006 06:19:23 -0000 1.5
@@ -110,11 +110,10 @@
realm = example
bindport = 5060
bindaddr = 127.0.0.1
-externip = 127.0.0.1
-externhost = sip.example.com
-localnet = 10.0.0.0/255.0.0.0
srvlookup = yes
useclientcode = yes
+allowguest = yes
+canreinvite = no
disallow = all
allow = ulaw
allow = alaw
@@ -128,7 +127,6 @@
;host = sipgate.de
;fromuser = NNNNNNN
;fromdomain = sipgate.de
-;nat = yes
;canreinvite = no
;disallow = all
;allow = ulaw
@@ -238,24 +236,24 @@
; internal to external mapping
exten = example,1,Goto(external,example,1)
-; internal SIP user <foo> #11
+; internal user <foo> #11
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)
-; internal SIP user <bar> #12
+; 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)
-; internal group SIP connection
+; 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)
-; internal Conference service
+; internal service <conference> #7<n>
exten = conference,1,Goto(70,1)
exten = 7,1,Set(TIMEOUT(digit)=3)
exten = 7,2,Set(TIMEOUT(response)=6)
@@ -263,28 +261,27 @@
exten = 7,n,GotoIf($[${number} >= 0 & ${number} <= 9]?7-ok,1)
exten = 7,n,Playback(conf-invalid)
exten = 7,n,Goto(7,3)
-exten = 7-ok,1,Set(SPYGROUP=conference-${number})
-exten = 7-ok,n,Playback(conf-placeintoconf)
+exten = 7-ok,1,Playback(conf-placeintoconf)
exten = 7-ok,n,SayNumber(${number})
exten = 7-ok,n,Conference(conference-${number}/M)
exten = 7-ok,n,Hangup
exten = _7[0-9],1,Set(TIMEOUT(digit)=3)
-exten = _7[0-9],n,Set(SPYGROUP=conference-${EXTEN:1})
exten = _7[0-9],n,Playback(conf-placeintoconf)
exten = _7[0-9],n,SayNumber(${EXTEN:1})
+exten = _7[0-9],n,Set(SPYGROUP=conference-${EXTEN:1})
exten = _7[0-9],n,Conference(conference-${EXTEN:1}/M)
exten = _7[0-9],n,Hangup
exten = _7X.,1,Playback(conf-invalid)
exten = _7X.,n,Hangup
-; internal Voicemail service (FIXME)
+; internal service <voicemail> #80/#*<n>
exten = voicemail,1,Goto(80,1)
exten = 80,1,VoicemailMain(s${CALLERIDNUM})
exten = 80,n,Hangup
exten = _*XX,1,Voicemail(u${EXTEN:1})
exten = _*XX,n,Hangup
-; internal Echo Test service
+; internal service <echo> #81
exten = echo,1,Goto(81,1)
exten = 81,1,Answer
exten = 81,n,Playback(demo-echotest)
@@ -292,7 +289,7 @@
exten = 81,n,Playback(demo-echodone)
exten = 81,n,Hangup
-; internal Asterisk PBX reload service
+; internal service <reload> #82
exten = reload,1,Goto(82,1)
exten = 82,1,Answer
exten = 82,n,Read(pin,conf-getpin,4)
@@ -308,10 +305,16 @@
exten = 82-ok,n,System(@l_prefix@/sbin/asterisk -rx reload)
exten = 82-ok,n,Hangup
-; external outgoing SIP connection
-exten = _9.,1,Dial(SIP/${EXTEN:[EMAIL PROTECTED],60)
-exten = _9.,n,Congestion
-exten = _9.,102,Busy
+; internal outgoing SIP call (part 1/2)
+; (notice sort-order trickery!)
+include = internal-siponly
+
+[internal-siponly]
+; internal outgoing SIP call (part 2/2)
+; (notice sort-order trickery!)
+exten = [EMAIL PROTECTED],1,Dial(SIP/[EMAIL PROTECTED],60)
+exten = [EMAIL PROTECTED],n,Hangup
+exten = [EMAIL PROTECTED],102,Busy
</file>
<file name="enum.conf">
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
