summaryrefslogtreecommitdiff
path: root/configs/basic-pbx
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2015-03-27 22:26:30 +0000
committerJonathan Rose <jrose@digium.com>2015-03-27 22:26:30 +0000
commitb56592e3ae92b4220821538aa888e8977902e549 (patch)
treef20b0dafcd8365d2d448cb1a5c9ec8268c291fa6 /configs/basic-pbx
parentc21e2e45a83d7735cbf086142e021193b07efe3f (diff)
SAC: Add conferencing extensions and configuration
Review: https://reviewboard.asterisk.org/r/4504/ ........ Merged revisions 433656 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433657 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs/basic-pbx')
-rw-r--r--configs/basic-pbx/confbridge.conf1
-rw-r--r--configs/basic-pbx/extensions.conf10
-rw-r--r--configs/basic-pbx/modules.conf2
3 files changed, 13 insertions, 0 deletions
diff --git a/configs/basic-pbx/confbridge.conf b/configs/basic-pbx/confbridge.conf
new file mode 100644
index 000000000..3a44e686a
--- /dev/null
+++ b/configs/basic-pbx/confbridge.conf
@@ -0,0 +1 @@
+; All conferences use default settings. This config must be present to load the confbridge application
diff --git a/configs/basic-pbx/extensions.conf b/configs/basic-pbx/extensions.conf
index 9212ff11d..d7fd2c3ca 100644
--- a/configs/basic-pbx/extensions.conf
+++ b/configs/basic-pbx/extensions.conf
@@ -19,6 +19,16 @@ exten = 8000,1,Verbose(1, "User ${CALLERID(num)} dialed the voicemail feature.")
exten = 1100,1,Verbose(1, "User ${CALLERID(num)} dialed the IVR.")
same = n,Goto(Main-IVR,2565551100,1)
+;Extension to enter a conference intended only for employees
+exten = 6000,1,Verbose(1, "User ${CALLERID(num)} dialed the employee conference.")
+ same = n,Confbridge(employees)
+ same = n,Hangup()
+
+;Extension to enter a conference intended for employees and customers
+exten = 6500,1,Verbose(1, "User ${CALLERID(num)} dialed the employee/customer mixed conference.")
+ same = n,Confbridge(mixed)
+ same = n,Hangup()
+
[External-Features]
; Extension for users to remotely check voicemail. Here we require the caller to
; enter their mailbox and pincode.
diff --git a/configs/basic-pbx/modules.conf b/configs/basic-pbx/modules.conf
index 9abcf493c..c0416a06f 100644
--- a/configs/basic-pbx/modules.conf
+++ b/configs/basic-pbx/modules.conf
@@ -13,6 +13,7 @@ load = app_stack.so
load = app_verbose.so
load = app_voicemail.so
load = app_directory.so
+load = app_confbridge.so
; Bridging
@@ -110,3 +111,4 @@ load = res_sorcery_astdb.so
load = res_sorcery_config.so
load = res_sorcery_memory.so
load = res_sorcery_realtime.so
+load = res_timing_timerfd.so