aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-04-10 18:18:21 +0200
committerPatrick McHardy <kaber@trash.net>2011-04-10 18:18:21 +0200
commit2ac6b3ac85972f5d4ec2b82eb299a7d85ff91c92 (patch)
treeeea1ce6ed8cc31a857d6b53c3edbe93d1c816511 /configs
parent71ee4dc26f3441e26f8310162f061a4beaa94a92 (diff)
parentc3ef7cd686f6352e6c0c1c5489dbc4c0d6e4b0ec (diff)
Merge branch 'master' of 192.168.0.100:/repos/git/asterisk
Diffstat (limited to 'configs')
-rw-r--r--configs/cdr_mysql.conf.sample31
-rw-r--r--configs/manager.conf.sample11
2 files changed, 27 insertions, 15 deletions
diff --git a/configs/cdr_mysql.conf.sample b/configs/cdr_mysql.conf.sample
index dd37e2ce9..04b70493b 100644
--- a/configs/cdr_mysql.conf.sample
+++ b/configs/cdr_mysql.conf.sample
@@ -42,18 +42,19 @@
;static "<value>" => <column>
;alias <cdrvar> => <column>
alias start => calldate
-alias callerid => clid
-;alias src => src
-;alias dst => dst
-;alias dcontext => dcontext
-;alias channel => channel
-;alias dstchannel => dstchannel
-;alias lastapp => lastapp
-;alias lastdata => lastdata
-;alias duration => duration
-;alias billsec => billsec
-;alias disposition => disposition
-;alias amaflags => amaflags
-;alias accountcode => accountcode
-;alias userfield => userfield
-;alias uniqueid => uniqueid
+;alias clid => <a_field_not_named_clid>
+;alias src => <a_field_not_named_src>
+;alias dst => <a_field_not_named_dst>
+;alias dcontext => <a_field_not_named_dcontext>
+;alias channel => <a_field_not_named_channel>
+;alias dstchannel => <a_field_not_named_dstchannel>
+;alias lastapp => <a_field_not_named_lastapp>
+;alias lastdata => <a_field_not_named_lastdata>
+;alias duration => <a_field_not_named_duration>
+;alias billsec => <a_field_not_named_billsec>
+;alias disposition => <a_field_not_named_disposition>
+;alias amaflags => <a_field_not_named_amaflags>
+;alias accountcode => <a_field_not_named_accountcode>
+;alias userfield => <a_field_not_named_userfield>
+;alias uniqueid => <a_field_not_named_uniqueid>
+
diff --git a/configs/manager.conf.sample b/configs/manager.conf.sample
index 82590801a..ef1b0b195 100644
--- a/configs/manager.conf.sample
+++ b/configs/manager.conf.sample
@@ -63,6 +63,17 @@ bindaddr = 0.0.0.0
; debug = on ; enable some debugging info in AMI messages (default off).
; Also accessible through the "manager debug" CLI command.
+; authtimeout specifies the maximum number of seconds a client has to
+; authenticate. If the client does not authenticate beofre this timeout
+; expires, the client will be disconnected. (default: 30 seconds)
+
+;authtimeout = 30
+
+; authlimit specifies the maximum number of unauthenticated sessions that will
+; be allowed to connect at any given time.
+
+;authlimit = 50
+
;httptimeout = 60
; a) httptimeout sets the Max-Age of the http cookie
; b) httptimeout is the amount of time the webserver waits