From 3976b604073915f8aaf5300c0b47169ccdc87dde Mon Sep 17 00:00:00 2001 From: pabelanger Date: Fri, 15 Oct 2010 19:53:06 +0000 Subject: Merged revisions 291940 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r291940 | pabelanger | 2010-10-15 15:50:22 -0400 (Fri, 15 Oct 2010) | 16 lines Merged revisions 291939 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r291939 | pabelanger | 2010-10-15 15:35:20 -0400 (Fri, 15 Oct 2010) | 9 lines Merged revisions 291938 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r291938 | pabelanger | 2010-10-15 15:30:41 -0400 (Fri, 15 Oct 2010) | 2 lines Clean up formatting. ........ ................ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@291941 f38db490-d61c-443f-a65b-d21fe96a405b --- configs/gtalk.conf.sample | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) (limited to 'configs') diff --git a/configs/gtalk.conf.sample b/configs/gtalk.conf.sample index 6b91c8f04..20604b8da 100644 --- a/configs/gtalk.conf.sample +++ b/configs/gtalk.conf.sample @@ -1,25 +1,22 @@ ;[general] -;context=default ;Context to dump call into -;bindaddr=0.0.0.0 ;Address to bind to -;externip=127.0.0.1 ;Set your external ip if you are behind a NAT. +;context=default ; Context to dump call into +;bindaddr=0.0.0.0 ; Address to bind to +;externip=127.0.0.1 ; Set your external ip if you are behind a NAT. +;stunaddr=mystunserver.com ; Get your external ip from a STUN server. + ; Note, if the STUN query is successful, this will + ; replace any value placed in externip; +;allowguest=yes ; Allow calls from people not in list of peers -;stunaddr=mystunserver.com ; Get your external ip from a STUN server. - ; Note, if the STUN query is successful, this will - ; replace any value placed in externip; -;allowguest=yes ;Allow calls from people not in - ;list of peers -; -;[guest] ;special account for options on guest account +;[guest] ; special account for options on guest account ;disallow=all ;allow=ulaw ;context=guest -; + ;[ogorman] -;username=ogorman@gmail.com ;username of the peer your - ;calling or accepting calls from +;username=ogorman@gmail.com ; username of the peer your + ; calling or accepting calls from ;disallow=all ;allow=ulaw ;context=default -;connection=asterisk ;client or component in jabber.conf - ;for the call to leave on. -; +;connection=asterisk ; client or component in jabber.conf for the + ; call to leave on. -- cgit v1.2.1