aboutsummaryrefslogtreecommitdiffstats
path: root/configs/users.conf.sample
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-04 21:01:30 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2011-01-04 21:01:30 +0000
commit20809f2c8a24f4fe34fa28ffe7463e485047ee1f (patch)
tree995688b7ac26399da897ba91d9bba4d3779c70ce /configs/users.conf.sample
parentc28b4de82dd99f0162ad08a8bfb0dc8a6ac52701 (diff)
Merged revisions 300433 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r300433 | lmadsen | 2011-01-04 15:00:55 -0600 (Tue, 04 Jan 2011) | 15 lines Merged revisions 300431 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r300431 | lmadsen | 2011-01-04 15:00:29 -0600 (Tue, 04 Jan 2011) | 7 lines Add some documentation to users.conf.sample. (closes issue #18531) Reported by: lathama Patches: users.conf.sample2.diff uploaded by lathama (license 1028) Tested by: lathama ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@300434 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs/users.conf.sample')
-rw-r--r--configs/users.conf.sample29
1 files changed, 28 insertions, 1 deletions
diff --git a/configs/users.conf.sample b/configs/users.conf.sample
index 9258cd3d6..7612546b3 100644
--- a/configs/users.conf.sample
+++ b/configs/users.conf.sample
@@ -51,6 +51,27 @@ hasmanager = no
;managerread = system,call,log,verbose,command,agent,user,config
;managerwrite = system,call,log,verbose,command,agent,user,config
;
+;
+; MAC Address for res_phoneprov
+;
+;macaddress = 112233445566
+;
+; Auto provision the phone with res_phoneprov
+;
+;autoprov = yes
+;
+; Line Keys for hardphone
+;
+;LINEKEYS = 1
+;
+; Line number for hardphone
+;
+;linenumber = 1
+;
+; Local Caller ID number used with res_phoneprov and Asterisk GUI
+;
+;cid_number = 6000
+;
; Remaining options are not specific to users.conf entries but are general.
;
callwaiting = yes
@@ -62,7 +83,7 @@ cancallforward = yes
callreturn = yes
callgroup = 1
pickupgroup = 1
-
+;nat = no
;[6000]
;fullname = Joe User
@@ -83,3 +104,9 @@ pickupgroup = 1
; alternateexts entry.
;
;alternateexts = 7057,3249
+;macaddress = 112233445566
+;autoprov = yes
+;LINEKEYS = 1
+;linenumber = 1
+;cid_number = 6000
+