Reverting -r347953 for ASTERISK-14122

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10@347955 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample
index 10c55ca7564aa17a82c887b23bc58131be44ae1e..841787c4c5caf99b0920353127df1c25ee5b6e37 100644 (file)
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -51,9 +51,9 @@
 ;
 ;language=en
 ;
-; Context for incoming calls. Defaults to 'default'
+; Context for calls. Defaults to 'default'
 ;
-context=public
+;context=incoming
 ;
 ; Switchtype:  Only used for PRI.
 ;

diff --git a/configs/chan_ooh323.conf.sample b/configs/chan_ooh323.conf.sample
index a39a47afc2738727c4a2af1ab18d7f9319c852d2..20ccf73ec3bc70504f8d8edfc8060a9e482a3ad9 100644 (file)
--- a/configs/chan_ooh323.conf.sample
+++ b/configs/chan_ooh323.conf.sample
@@ -88,7 +88,7 @@ gatekeeper = DISABLE
 
 ;Sets default context all clients will be placed in.
 ;Default - default
-context=public
+context=default
 
 ;Sets rtptimeout for all clients, unless overridden
 ;Default - 60 seconds

diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample
index b9d21d3613a69b21163c966b6da6b8cbc11283fb..89068457837d7e040887f7bac00348376cca77de 100644 (file)
--- a/configs/extensions.conf.sample
+++ b/configs/extensions.conf.sample
@@ -653,15 +653,6 @@ exten => _X.,1,Macro(page,SIP/${EXTEN})
 ;exten => 1,1,Goto(default,steve,1)
 ;exten => 2,1,Goto(default,mark,2)
 
-[public]
-;
-; ATTENTION: If your Asterisk is connected to the internet and you do
-; not have allowguest=no in sip.conf, everybody out there may use your
-; public context without authentication.  In that case you want to
-; double check which services you offer to the world.
-;
-include => demo
-
 [default]
 ;
 ; By default we include the demo.  In a production system, you

diff --git a/configs/extensions.lua.sample b/configs/extensions.lua.sample
index 3badcb4aae7263f79452ab9c85be14c2533aac9a..5868de4f7beb5186fd1602dc79fa5000447ce191 100644 (file)
--- a/configs/extensions.lua.sample
+++ b/configs/extensions.lua.sample
@@ -144,7 +144,7 @@ extensions = {
                end;
 
                ["1000"] = function()
-                       app.goto("demo", "s", 1)
+                       app.goto("default", "s", 1)
                end;
 
                ["1234"] = function()
@@ -194,15 +194,6 @@ extensions = {
                include = {"demo"};
        };
 
-       public = {
-               -- ATTENTION: If your Asterisk is connected to the internet and you do
-               -- not have allowguest=no in sip.conf, everybody out there may use your
-               -- public context without authentication.  In that case you want to
-               -- double check which services you offer to the world.
-               --
-               include = {"demo"};
-       };
-
        ["local"] = {
                ["_NXXXXXX"] = outgoing_local;
        };

diff --git a/configs/iax.conf.sample b/configs/iax.conf.sample
index 2f5858e95ae6c5e82aa86705f69f86c81b84b99b..35b8d7744ca2c36c42e66c7ff44c5ac7e74dd0f6 100644 (file)
--- a/configs/iax.conf.sample
+++ b/configs/iax.conf.sample
@@ -409,7 +409,7 @@ autokill=yes
 ;
 [guest]
 type=user
-context=public
+context=default
 callerid="Guest IAX User"
 
 ;

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index bea93c58b36db2b0b10de6e9a83829b8a134702c..8cc496be879b1b4f14e5132d62ff1a59dd46ce08 100644 (file)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -112,7 +112,7 @@
 ; "setvar" to set variables that can be used in the dialplan for various limits.
 
 [general]
-context=public                  ; Default context for incoming calls. Defaults to 'default'
+context=default                 ; Default context for incoming calls
 ;allowguest=no                  ; Allow or reject guest calls (default is yes)
                                ; If your Asterisk is connected to the Internet
                                ; and you have allowguest=yes

diff --git a/configs/vpb.conf.sample b/configs/vpb.conf.sample
index fecb3ec597ccdfe346f34cbfa7fd16b04027cdf7..31e5da1ec66e02a4738f61268f4d44e48c8b9c53 100644 (file)
--- a/configs/vpb.conf.sample
+++ b/configs/vpb.conf.sample
@@ -77,7 +77,7 @@ language=en
 ;
 ; Default context
 ;
-context=public
+context=default
 
 ;
 ; Echo cancellation