Merged revisions 289718 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r289718 | pabelanger | 2010-10-01 13:19:49 -0400 (Fri, 01 Oct 2010) | 20 lines Merged revisions 289704 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r289704 | pabelanger | 2010-10-01 13:09:03 -0400 (Fri, 01 Oct 2010) | 13 lines 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: https://origsvn.digium.com/svn/asterisk/trunk@289732 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
parent
bb485fc6f9
commit
1517166700
|
@ -1,41 +1,36 @@
|
||||||
[general]
|
[general]
|
||||||
;debug=yes ;;Turn on debugging by default.
|
;debug=yes ; Enable debugging (disabled by default).
|
||||||
;autoprune=yes ;;Auto remove users from buddy list. Depending on your
|
;autoprune=yes ; Auto remove users from buddy list. Depending on your
|
||||||
;;setup (ie, using your personal Gtalk account for a test)
|
; setup (ie, using your personal Gtalk account for a test)
|
||||||
;;you might lose your contacts list. Default is 'no'.
|
; you might lose your contacts list. Default is 'no'.
|
||||||
;autoregister=yes ;;Auto register users from buddy list.
|
;autoregister=yes ; Auto register users from buddy list.
|
||||||
;collection_nodes=yes ;;Enable support for XEP-0248 for use with
|
;collection_nodes=yes ; Enable support for XEP-0248 for use with
|
||||||
;;distributed device state. Default is 'no'.
|
; distributed device state. Default is 'no'.
|
||||||
;pubsub_autocreate=yes ;;Whether or not the PubSub server supports/is using
|
;pubsub_autocreate=yes ; Whether or not the PubSub server supports/is using
|
||||||
;;auto-create for nodes. If it is, we have to
|
; auto-create for nodes. If it is, we have to
|
||||||
;;explicitly pre-create nodes before publishing them.
|
; explicitly pre-create nodes before publishing them.
|
||||||
;;Default is 'no'.
|
; Default is 'no'.
|
||||||
;auth_policy=accept ;;Auto accept users' subscription requests (default).
|
;auth_policy=accept ; Auto accept users' subscription requests (default).
|
||||||
;;Set to deny for auto denial.
|
; Set to deny for auto denial.
|
||||||
|
;[asterisk]
|
||||||
|
;type=client ; Client or Component connection
|
||||||
;[asterisk] ;;label
|
;serverhost=astjab.org ; Route to server for example, talk.google.com
|
||||||
;type=client ;;Client or Component connection
|
;pubsub_node=pubsub.astjab.org ; Node to use for publishing events via PubSub
|
||||||
;serverhost=astjab.org ;;Route to server for example,
|
;username=asterisk@astjab.org/asterisk ; Username with optional resource.
|
||||||
;; talk.google.com
|
;secret=blah ; Password
|
||||||
;pubsub_node=pubsub.astjab.org ;;Node to use for publishing events via PubSub
|
;priority=1 ; Resource priority
|
||||||
;username=asterisk@astjab.org/asterisk ;;Username with optional resource.
|
;port=5222 ; Port to use defaults to 5222
|
||||||
;secret=blah ;;Password
|
;usetls=yes ; Use tls or not
|
||||||
;priority=1 ;;Resource priority
|
;usesasl=yes ; Use sasl or not
|
||||||
;port=5222 ;;Port to use defaults to 5222
|
;buddy=mogorman@astjab.org ; Manual addition of buddy to list.
|
||||||
;usetls=yes ;;Use tls or not
|
; For distributed events, these buddies are
|
||||||
;usesasl=yes ;;Use sasl or not
|
; automatically added in the whitelist as
|
||||||
;buddy=mogorman@astjab.org ;;Manual addition of buddy to list.
|
; 'owners' of the node(s).
|
||||||
;;For distributed events, these buddies are
|
;distribute_events=yes ; Whether or not to distribute events using
|
||||||
;;automatically added in the whitelist as
|
; this connection. Default is 'no'.
|
||||||
;;'owners' of the node(s).
|
;status=available ; One of: chat, available, away, xaway, or dnd
|
||||||
;distribute_events=yes ;;Whether or not to distribute events using
|
;statusmessage="I am available" ; Have custom status message for Asterisk
|
||||||
;;this connection. Default is 'no'.
|
;timeout=5 ; Timeout (in seconds) on the message stack, defaults to 5.
|
||||||
;status=available ;;One of: chat, available, away,
|
; Messages stored longer than this value will be deleted by Asterisk.
|
||||||
;; xaway, or dnd
|
; This option applies to incoming messages only, which are intended to
|
||||||
;statusmessage="I am available" ;;Have custom status message for
|
; be processed by the JABBER_RECEIVE dialplan function.
|
||||||
;;Asterisk.
|
|
||||||
;timeout=5 ;;Timeout (in seconds) on the message stack, defaults to 5.
|
|
||||||
;;Messages stored longer than this value will be deleted by Asterisk.
|
|
||||||
;;This option applies to incoming messages only, which are intended to
|
|
||||||
;;be processed by the JABBER_RECEIVE dialplan function.
|
|
||||||
|
|
|
@ -4480,7 +4480,7 @@ static int aji_create_buddy(char *label, struct aji_client *client)
|
||||||
static int aji_load_config(int reload)
|
static int aji_load_config(int reload)
|
||||||
{
|
{
|
||||||
char *cat = NULL;
|
char *cat = NULL;
|
||||||
int debug = 1;
|
int debug = 0;
|
||||||
struct ast_config *cfg = NULL;
|
struct ast_config *cfg = NULL;
|
||||||
struct ast_variable *var = NULL;
|
struct ast_variable *var = NULL;
|
||||||
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
|
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
|
||||||
|
|
Loading…
Reference in New Issue