diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-28 18:21:47 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-28 18:21:47 +0000 |
commit | e79b5f130aa0488592b5aec101e6a1b314236c9c (patch) | |
tree | 260e8969cd54aef7512f6cdc724ffbf20d83e39f /configs/sla.conf.sample | |
parent | 224e5b2cd8d28051154aa6c1858a0e43b60dab37 (diff) |
Merged revisions 57089 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r57089 | russell | 2007-02-28 12:20:05 -0600 (Wed, 28 Feb 2007) | 8 lines
Merge current set of changes from svn/asterisk/team/russell/sla_updates
* Add support for station ring delays. Ring delays can be set globally for a
station or for specific trunks on the station.
* Fix a few bugs in existing code.
* Restructure and Reorganize code to improve readability and maintainability.
* Improve formatting of the "sla show (trunks|stations)" CLI commands.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@57090 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs/sla.conf.sample')
-rw-r--r-- | configs/sla.conf.sample | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/configs/sla.conf.sample b/configs/sla.conf.sample index 839d6d936..701ed1d64 100644 --- a/configs/sla.conf.sample +++ b/configs/sla.conf.sample @@ -1,6 +1,8 @@ ; ; Configuration for Shared Line Appearances (SLA). ; +; See doc/sla.txt for more information. +; ; ---- General Options ---------------- [general] @@ -52,15 +54,21 @@ ; have its context configured to the same one listed here. ;ringtimeout=10 ; Set a timeout for how long to allow the station to ring for an -; ; incoming call, in seconds. + ; incoming call, in seconds. +;ringdelay=10 ; Set a time for how long to wait before beginning to ring this station + ; once there is an incoming call, in seconds. ;trunk=line1 ; Individually list all of the trunks that will appear on this station. This ; order is significant. It should be the same order as they appear on the ; phone. The order here defines the order of preference that the trunks will ; be used. ;trunk=line2 -;trunk=line3 +;trunk=line3,ringdelay=5 ; A ring delay for the station can also be specified for a specific trunk. + ; If a ring delay is specified both for the whole station and for a specific + ; trunk on a station, the setting for the specific trunk will take priority. + ; This value is in seconds. + ;trunk=line4,ringtimeout=5 ; A ring timeout for the station can also be specified for a specific trunk. ; If a ring timeout is specified both for the whole station and for a specific ; trunk on a station, the setting for the specific trunk will take priority. |