diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-01 17:09:03 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-10-01 17:09:03 +0000 |
| commit | 045e4bf061183e40d4e39eb59f05913a726754c8 (patch) | |
| tree | 2935e8d6f66142c8542afd0149e48d39f0d46c31 /configs | |
| parent | 3f8916db680d5c1aa3821e04a99c883ce25e9471 (diff) | |
Merged revisions 289703 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r289703 | pabelanger | 2010-10-01 13:03:11 -0400 (Fri, 01 Oct 2010) | 6 lines
Disable debugging by default
and reformat .config file.
Review: https://reviewboard.asterisk.org/r/929/
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@289704 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/jabber.conf.sample | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/configs/jabber.conf.sample b/configs/jabber.conf.sample index 6cfb755bd..4e815ef83 100644 --- a/configs/jabber.conf.sample +++ b/configs/jabber.conf.sample @@ -1,23 +1,19 @@ [general] -;debug=yes ;;Turn on debugging by default. -;autoprune=yes ;;Auto remove users from buddy list. Depending on your - ;;setup (ie, using your personal Gtalk account for a test) - ;;you might lose your contacts list. Default is 'no'. -;autoregister=yes ;;Auto register users from buddy list. +;debug=yes ; Enable debugging (disabled by default). +;autoprune=yes ; Auto remove users from buddy list. Depending on your + ; setup (ie, using your personal Gtalk account for a test) + ; you might lose your contacts list. Default is 'no'. +;autoregister=yes ; Auto register users from buddy list. -;[asterisk] ;;label -;type=client ;;Client or Component connection -;serverhost=astjab.org ;;Route to server for example, - ;; talk.google.com -;username=asterisk@astjab.org/asterisk ;;Username with optional resource. -;secret=blah ;;Password -;priority=1 ;;Resource priority -;port=5222 ;;Port to use defaults to 5222 -;usetls=yes ;;Use tls or not -;usesasl=yes ;;Use sasl or not -;buddy=mogorman@astjab.org ;;Manual addition of buddy to list. -;status=available ;;One of: chat, available, away, - ;; xaway, or dnd -;statusmessage="I am available" ;;Have custom status message for - ;;Asterisk. -;timeout=100 ;;Timeout on the message stack. +;[asterisk] +;type=client ; Client or Component connection +;serverhost=astjab.org ; Route to server for example, talk.google.com +;username=asterisk@astjab.org/asterisk ; Username with optional resource. +;secret=blah ; Password +;priority=1 ; Resource priority +;port=5222 ; Port to use defaults to 5222 +;usetls=yes ; Use tls or not +;usesasl=yes ; Use sasl or not +;buddy=mogorman@astjab.org ; Manual addition of buddy to list. +;statusmessage="I am available" ; Have custom status message for Asterisk +;timeout=100 ; Timeout on the message stack. |