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

diff --git a/configs/basic-pbx/confbridge.conf b/configs/basic-pbx/confbridge.conf
new file mode 100644 (file)
index 0000000..3a44e68
--- /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 9212ff11dde6f4b7ee2178ad2b4fb27c1f143a58..d7fd2c3ca3f2ef516941b900699ef9ab4a272354 100644 (file)
--- 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 9abcf493c8b40c4656953fd4340c1e019d5478b7..c0416a06ffab3d3e910c4ad2cea6bea3950bf18f 100644 (file)
--- 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