From: horse69 <horse69@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Sun, 28 Oct 2012 20:47:19 +0000 (+0000)
Subject: git-svn-id: https://svn.code.sf.net/p/freetel/code@856 01035d8c-6547-0410-b346-abe4f9... 
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=de2e60c58518f0cc42db375e0e3df25f9b28563e;p=freetel-svn-tracking.git

git-svn-id: https://svn.code.sf.net/p/freetel/code@856 01035d8c-6547-0410-b346-abe4f91aad63
---

diff --git a/mini-asterisk-gui2/etc/asterisk/sip.conf b/mini-asterisk-gui2/etc/asterisk/sip.conf
index acd09bd6..ad8afb3d 100644
--- a/mini-asterisk-gui2/etc/asterisk/sip.conf
+++ b/mini-asterisk-gui2/etc/asterisk/sip.conf
@@ -780,3 +780,46 @@ disallow=all
 allow=ulaw,alaw
 qualify=yes
 
+; Pre-configured mini-asterisk SIP trunks
+
+[usernat] ; "SIP-NAT" mini-asterisk do not remove this comment
+; You reach your ITSP via a NAT router (most common)
+type=friend             ; "SIP-NAT" mini-asterisk do not remove this comment
+context=default         ; "SIP-NAT" mini-asterisk do not remove this comment
+username=usernat        ; "SIP-NAT" mini-asterisk do not remove this comment
+secret=passwordnat      ; "SIP-NAT" mini-asterisk do not remove this comment
+host=hostnat            ; "SIP-NAT" mini-asterisk do not remove this comment
+canreinvite=no          ; "SIP-NAT" mini-asterisk do not remove this comment
+disallow=all            ; "SIP-NAT" mini-asterisk do not remove this comment
+allow=ulaw,alaw         ; "SIP-NAT" mini-asterisk do not remove this comment
+qualify=yes             ; "SIP-NAT" mini-asterisk do not remove this comment
+nat=yes                 ; "SIP-NAT" mini-asterisk do not remove this comment
+
+[usersip] ; "SIP" mini-asterisk do not remove this comment
+; No NAT router between your Phone system and your ITSP
+type=friend        ; "SIP" mini-asterisk do not remove this comment
+context=default    ; "SIP" mini-asterisk do not remove this comment
+username=usersip   ; "SIP" mini-asterisk do not remove this comment
+secret=passwordsip ; "SIP" mini-asterisk do not remove this comment
+host=hostsip       ; "SIP" mini-asterisk do not remove this comment
+canreinvite=no     ; "SIP" mini-asterisk do not remove this comment
+disallow=all       ; "SIP" mini-asterisk do not remove this comment
+allow=ulaw,alaw    ; "SIP" mini-asterisk do not remove this comment
+qualify=yes        ; "SIP" mini-asterisk do not remove this comment
+
+[userjaz] ; "Jazmin" mini-asterisk do not remove this comment
+; <a href="http://www.jazmin.com.au/">Jazmin</a> are a South Australian ITSP
+host=sip.jazmin.net.au        ; "Jazmin" mini-asterisk do not remove this comment
+secret=passwordjaz            ; "Jazmin" mini-asterisk do not remove this comment
+username=userjaz              ; "Jazmin" mini-asterisk do not remove this comment
+fromdomain=sip.jazmin.net.au  ; "Jazmin" mini-asterisk do not remove this comment
+fromuser=userjaz              ; "Jazmin" mini-asterisk do not remove this comment
+insecure=port,invite          ; "Jazmin" mini-asterisk do not remove this comment
+type=friend                   ; "Jazmin" mini-asterisk do not remove this comment
+disallow=all                  ; "Jazmin" mini-asterisk do not remove this comment
+allow=ulaw                    ; "Jazmin" mini-asterisk do not remove this comment
+allow=alaw                    ; "Jazmin" mini-asterisk do not remove this comment
+dtmfmod=rfc2833               ; "Jazmin" mini-asterisk do not remove this comment
+qualify=yes                   ; "Jazmin" mini-asterisk do not remove this comment
+canreinvite=no                ; "Jazmin" mini-asterisk do not remove this comment
+nat=yes                       ; "Jazmin" mini-asterisk do not remove this comment
\ No newline at end of file
diff --git a/mini-asterisk-gui2/install_gui2.sh b/mini-asterisk-gui2/install_gui2.sh
index 43549053..541e490d 100755
--- a/mini-asterisk-gui2/install_gui2.sh
+++ b/mini-asterisk-gui2/install_gui2.sh
@@ -61,6 +61,10 @@ ipkg install fping
 
 cp mini-asterisk-gui2/etc/asterisk/extensions.conf /etc/asterisk/extensions.conf
 
+# check sip.conf has new provider keywords
+
+cp mini-asterisk-gui2/etc/asterisk/sip.conf /etc/asterisk/sip.conf
+
 # check lighttpd installed
 # check cgi support in lighttpd