[asterisk-commits] jrose: trunk r433657 - in /trunk: ./ configs/basic-pbx/

[SVN commits to the Asterisk project]

Author: jrose
Date: Fri Mar 27 17:26:30 2015
New Revision: 433657

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433657
Log:
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

Added:
    trunk/configs/basic-pbx/confbridge.conf
      - copied unchanged from r433656, branches/13/configs/basic-pbx/confbridge.conf
Modified:
    trunk/   (props changed)
    trunk/configs/basic-pbx/extensions.conf
    trunk/configs/basic-pbx/modules.conf

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/configs/basic-pbx/extensions.conf
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/basic-pbx/extensions.conf?view=diff&rev=433657&r1=433656&r2=433657
==============================================================================
--- trunk/configs/basic-pbx/extensions.conf (original)
+++ trunk/configs/basic-pbx/extensions.conf Fri Mar 27 17:26:30 2015
@@ -18,6 +18,16 @@
 ; Exten to dial the main IVR internally.
 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

Modified: trunk/configs/basic-pbx/modules.conf
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/basic-pbx/modules.conf?view=diff&rev=433657&r1=433656&r2=433657
==============================================================================
--- trunk/configs/basic-pbx/modules.conf (original)
+++ trunk/configs/basic-pbx/modules.conf Fri Mar 27 17:26:30 2015
@@ -13,6 +13,7 @@
 load = app_verbose.so
 load = app_voicemail.so
 load = app_directory.so
+load = app_confbridge.so
 
 ; Bridging
 
@@ -110,3 +111,4 @@
 load = res_sorcery_config.so
 load = res_sorcery_memory.so
 load = res_sorcery_realtime.so
+load = res_timing_timerfd.so