diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-16 23:53:58 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-09-16 23:53:58 +0000 |
commit | 5c0e56df213e669dd543a5996c77383a17a6ecd2 (patch) | |
tree | 1298da607ca8facdbaf23866e9294b57e39057d9 /configs | |
parent | 5b13041e0f380ccdf5ce117653086312c4a3a7be (diff) |
merge markster's usersconf branch with some slight changes
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43052 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r-- | configs/extensions.conf.sample | 17 | ||||
-rw-r--r-- | configs/users.conf.sample | 41 | ||||
-rw-r--r-- | configs/voicemail.conf.sample | 7 |
3 files changed, 64 insertions, 1 deletions
diff --git a/configs/extensions.conf.sample b/configs/extensions.conf.sample index 864644c2f..ff9a305b5 100644 --- a/configs/extensions.conf.sample +++ b/configs/extensions.conf.sample @@ -53,6 +53,11 @@ clearglobalvars=no ; ;priorityjumping=yes ; +; User context is where entries from users.conf are registered. The +; default value is 'default' +; +;userscontext=default +; ; You can include other config files, use the #include command ; (without the ';'). Note that this is different from the "include" command ; that includes contexts within other contexts. The #include command works @@ -316,6 +321,18 @@ include => parkedcalls ; ; eswitch => IAX2/context@${CURSERVER} +[macro-trunkdial] +; +; Standard trunk dial macro (hangs up on a dialstatus that should +; terminate call) +; ${ARG1} - What to dial +; +exten => s,1,Dial(${ARG1}) +exten => s,n,Goto(s-${DIALSTATUS},1) +exten => s-NOANSWER,1,Hangup +exten => s-BUSY,1,Hangup +exten => _s-.,1,NoOp + [macro-stdexten]; ; ; Standard extension macro: diff --git a/configs/users.conf.sample b/configs/users.conf.sample new file mode 100644 index 000000000..d3257a175 --- /dev/null +++ b/configs/users.conf.sample @@ -0,0 +1,41 @@ +; +; User configuration +; +; Creating entries in users.conf is a "shorthand" for creating individual +; entries in each configuration file. Using users.conf is not intended to +; provide you with as much flexibility as using the separate configuration +; files (e.g. sip.conf, iax.conf, etc) but is intended to accelerate the +; simple task of adding users. Note that creating individual items (e.g. +; custom SIP peers, IAX friends, etc.) will allow you to override specific +; parameters within this file. +; + +[general] +fullname = New User +userbase = 6000 +hasvoicemail = yes +hassip = yes +hasiax = yes +hasmanager = no +callwaiting = yes +threewaycalling = yes +callwaitingcallerid = yes +transfer = yes +canpark = yes +cancallforward = yes +callreturn = yes +callgroup = 1 +pickupgroup = 1 + + +;[6000] +;fullname = Joe User +;email = joe@foo.bar +;secret = 1234 +;zapchan = 1 +;hasvoicemail = yes +;hassip = yes +;hasiax = no +;hasmanager = no +;callwaiting = no +;context = international diff --git a/configs/voicemail.conf.sample b/configs/voicemail.conf.sample index 53d16278b..27c364246 100644 --- a/configs/voicemail.conf.sample +++ b/configs/voicemail.conf.sample @@ -49,7 +49,12 @@ maxsilence=10 silencethreshold=128 ; Max number of failed login attempts maxlogins=3 - +; +; User context is where entries from users.conf are registered. The +; default value is 'default' +; +;userscontext=default +; ; If you need to have an external program, i.e. /usr/bin/myapp ; called when a voicemail is left, delivered, or your voicemailbox ; is checked, uncomment this. It can also be set to 'smdi' to use |