aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-03-18 18:59:32 +0100
committerPatrick McHardy <kaber@trash.net>2011-03-18 18:59:32 +0100
commitb7347a56f80f8139806ba18526c99160587b6110 (patch)
tree81dba3ab302492def1660364830792a58b1724ca /configs
parent3299fdd755d59a18f0865d0902b2d3c73b6c92f0 (diff)
parentd48e14fed07928e4b21956fb076437fef1b2e98c (diff)
Merge branch 'master' of 192.168.0.100:/repos/git/asterisk
Diffstat (limited to 'configs')
-rw-r--r--configs/calendar.conf.sample7
-rw-r--r--configs/extensions.lua.sample11
-rw-r--r--configs/indications.conf.sample2
-rw-r--r--configs/sip.conf.sample4
4 files changed, 21 insertions, 3 deletions
diff --git a/configs/calendar.conf.sample b/configs/calendar.conf.sample
index ad3ce09..82b8702 100644
--- a/configs/calendar.conf.sample
+++ b/configs/calendar.conf.sample
@@ -32,6 +32,13 @@
;appdata = tt-weasels ; Data part of application to execute on answer
;
;waittime = 30 ; How long to wait for an answer, defaults to 30 seconds
+;
+; Channel variables can be set on the notification channel. The format is
+; setvar=name=value. Variable subsitution is done on the value to allow the use of dialplan
+; functions like CALENDAR_EVENT. The variables are set in order, so one can use the value
+; of earlier variables in the definition of later ones.
+;
+;setvar = CALLERID(name)=${CALENDAR_EVENT(summary)}
;[calendar2]
; Note: Support for Exchange Server 2003
diff --git a/configs/extensions.lua.sample b/configs/extensions.lua.sample
index df32ec7..bd6fb1f 100644
--- a/configs/extensions.lua.sample
+++ b/configs/extensions.lua.sample
@@ -197,3 +197,14 @@ extensions = {
};
}
+hints = {
+ demo = {
+ [1000] = "SIP/1000";
+ [1001] = "SIP/1001";
+ };
+
+ default = {
+ ["1234"] = "SIP/1234";
+ };
+}
+
diff --git a/configs/indications.conf.sample b/configs/indications.conf.sample
index 60efcb3..1a0cfc1 100644
--- a/configs/indications.conf.sample
+++ b/configs/indications.conf.sample
@@ -153,7 +153,7 @@ ring = 425/1000,0/3000
congestion = 425/167,0/167
callwaiting = 1400/175,0/175,1400/175,0/3500
; DIALRECALL - not specified
-dialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440"
+dialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
; RECORDTONE - not specified
record = 1400/500,0/15000
info = 900/330,1400/330,1800/330,0/1000
diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 92e41e4..a60ea34 100644
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -179,8 +179,8 @@ udpbindaddr=0.0.0.0 ; IP address to bind UDP listen socket to (0.0.0
;
; Note also that while Asterisk currently will parse an Allow header to learn
; what methods an endpoint supports, the only actual use for this currently
-; is for determining if Asterisk may send connected line UPDATE requests. Its
-; use may be expanded in the future.
+; is for determining if Asterisk may send connected line UPDATE requests and
+; MESSAGE requests. Its use may be expanded in the future.
;
; disallowed_methods = UPDATE