From 9a842cd8b333693733ec3fa64ca5cf0d2a13cf0a Mon Sep 17 00:00:00 2001
From: mpmc <markc@markc.net>
Date: Sun, 2 Jul 2023 23:16:46 +0100
Subject: [PATCH] ast: move basic config to own folder

---
 asterisk/conf/{ => basic}/asterisk.conf       |  0
 asterisk/conf/{ => basic}/extensions.conf     | 32 +++++++++----------
 asterisk/conf/{ => basic}/indications.conf    |  0
 asterisk/conf/{ => basic}/logger.conf         |  0
 asterisk/conf/{ => basic}/modules.conf        |  0
 asterisk/conf/{ => basic}/pjsip.conf          |  0
 .../{ => basic}/pjsip_identify_trunk_one.conf |  0
 .../conf/{ => basic}/pjsip_trunk_one.conf     |  0
 asterisk/conf/{ => basic}/pjsip_users.conf    |  0
 asterisk/conf/{ => basic}/pjsip_wizard.conf   |  0
 asterisk/conf/{ => basic}/queues.conf         |  2 +-
 .../conf/{ => basic}/res_stun_monitor.conf    |  0
 asterisk/conf/{ => basic}/voicemail.conf      |  0
 13 files changed, 17 insertions(+), 17 deletions(-)
 rename asterisk/conf/{ => basic}/asterisk.conf (100%)
 rename asterisk/conf/{ => basic}/extensions.conf (80%)
 rename asterisk/conf/{ => basic}/indications.conf (100%)
 rename asterisk/conf/{ => basic}/logger.conf (100%)
 rename asterisk/conf/{ => basic}/modules.conf (100%)
 rename asterisk/conf/{ => basic}/pjsip.conf (100%)
 rename asterisk/conf/{ => basic}/pjsip_identify_trunk_one.conf (100%)
 rename asterisk/conf/{ => basic}/pjsip_trunk_one.conf (100%)
 rename asterisk/conf/{ => basic}/pjsip_users.conf (100%)
 rename asterisk/conf/{ => basic}/pjsip_wizard.conf (100%)
 rename asterisk/conf/{ => basic}/queues.conf (96%)
 rename asterisk/conf/{ => basic}/res_stun_monitor.conf (100%)
 rename asterisk/conf/{ => basic}/voicemail.conf (100%)

diff --git a/asterisk/conf/asterisk.conf b/asterisk/conf/basic/asterisk.conf
similarity index 100%
rename from asterisk/conf/asterisk.conf
rename to asterisk/conf/basic/asterisk.conf
diff --git a/asterisk/conf/extensions.conf b/asterisk/conf/basic/extensions.conf
similarity index 80%
rename from asterisk/conf/extensions.conf
rename to asterisk/conf/basic/extensions.conf
index c70ee38..93ca40c 100644
--- a/asterisk/conf/extensions.conf
+++ b/asterisk/conf/basic/extensions.conf
@@ -29,7 +29,7 @@ exten => s,1,Queue(${QUEUE_ONE},nr,,,50)
 [outbound-one]
 exten => _X.,1,Verbose(1, "INFO: using ${TRUNK_ONE_CID} for call to ${EXTEN}.")
  same => n,Set(CALLERID(all)=${TRUNK_ONE_CID})
- same => n,Dial(PJSIP/${EXTEN}@trunk-one)
+ same => n,Dial(PJSIP/${EXTEN}@trunk-one,,r)
  same => n,GotoIf($["${DIALSTATUS}"="CONGESTION"]?outbound-two,${EXTEN},1)
  same => n,GotoIf($["${DIALSTATUS}"="CHANUNAVAIL"]?outbound-two,${EXTEN},1)
  same => n,Hangup()
@@ -37,32 +37,32 @@ exten => _X.,1,Verbose(1, "INFO: using ${TRUNK_ONE_CID} for call to ${EXTEN}.")
 [outbound-two]
 exten => _X.,1,Verbose(1, "INFO: using ${TRUNK_TWO_CID} for call to ${EXTEN}.")
  same => n,Set(CALLERID(all)=${TRUNK_TWO_CID})
- same => n,Dial(PJSIP/${EXTEN}@trunk-two)
+ same => n,Dial(PJSIP/${EXTEN}@trunk-two,,r)
  same => n,GotoIf($["${DIALSTATUS}"="CONGESTION"]?default,s,1)
  same => n,GotoIf($["${DIALSTATUS}"="CHANUNAVAIL"]?default,s,1)
  same => n,Hangup()
 
 [app-lastcallreturn]
 exten => 1471,1,Verbose(1, "${CALLERID(num)} dialed app-lastcallreturn.")
- same => Wait(1)
- same => n,Answer(1)
- same => n,Playback(last-num-to-call)
  same => n,Set(number=${DB(lastcaller/${CALLERID(num)})})
- same => n,GotoIf($["${number}" = ""]?s-nonum,1)
- same => n,SayDigits(${number})
- same => n,Wait(2)
+ same => n,Answer(2)
+ same => n,GotoIf($["${number}" = ""]?nonum,1)
+ same => n,Playback(info-about-last-call&telephone-number)
+ same => n,Wait(1)
  same => n,SayDigits(${number})
  same => n,Wait(1)
  same => n,Playback(to-call-num-press)
- same => n,Playback(digits/1)
- same => n,Wait(60)
- same => n,Hangup(3)
+ same => n,Playback(digits/3)
+ same => n,WaitExten(10)
+ same => n,Goto(timeout,1)
 
-exten => 1,1,Goto(outbound-one,${number},1)
+exten => 3,1,Goto(outbound-one,${number},1)
  same => n,Hangup()
 
-exten => s-nonum,1,Playback(unidentified-no-callback)
- same => n,Hangup(3)
+exten => nonum,1,Playback(unidentified-no-callback)
+ same => n,Hangup()
+
+exten => timeout,1,Hangup()
 
 [app-vm]
 exten = 1571,1,Verbose(1, "${CALLERID(num)} dialed the voicemail feature.")
@@ -96,7 +96,7 @@ exten => i,1,Answer(1)
  same => n,Hangup()
 
 [to-ext]
-exten => s,1,Set(DB(lastcaller/${EXTEN})=${CALLERID(num)})
- same => n,Dial(PJSIP/${EXTEN})
+exten => _X.,1,Set(DB(lastcaller/${EXTEN})=${CALLERID(num)})
+ same => n,Dial(PJSIP/${EXTEN},,r)
  same => n,Hangup()
 
diff --git a/asterisk/conf/indications.conf b/asterisk/conf/basic/indications.conf
similarity index 100%
rename from asterisk/conf/indications.conf
rename to asterisk/conf/basic/indications.conf
diff --git a/asterisk/conf/logger.conf b/asterisk/conf/basic/logger.conf
similarity index 100%
rename from asterisk/conf/logger.conf
rename to asterisk/conf/basic/logger.conf
diff --git a/asterisk/conf/modules.conf b/asterisk/conf/basic/modules.conf
similarity index 100%
rename from asterisk/conf/modules.conf
rename to asterisk/conf/basic/modules.conf
diff --git a/asterisk/conf/pjsip.conf b/asterisk/conf/basic/pjsip.conf
similarity index 100%
rename from asterisk/conf/pjsip.conf
rename to asterisk/conf/basic/pjsip.conf
diff --git a/asterisk/conf/pjsip_identify_trunk_one.conf b/asterisk/conf/basic/pjsip_identify_trunk_one.conf
similarity index 100%
rename from asterisk/conf/pjsip_identify_trunk_one.conf
rename to asterisk/conf/basic/pjsip_identify_trunk_one.conf
diff --git a/asterisk/conf/pjsip_trunk_one.conf b/asterisk/conf/basic/pjsip_trunk_one.conf
similarity index 100%
rename from asterisk/conf/pjsip_trunk_one.conf
rename to asterisk/conf/basic/pjsip_trunk_one.conf
diff --git a/asterisk/conf/pjsip_users.conf b/asterisk/conf/basic/pjsip_users.conf
similarity index 100%
rename from asterisk/conf/pjsip_users.conf
rename to asterisk/conf/basic/pjsip_users.conf
diff --git a/asterisk/conf/pjsip_wizard.conf b/asterisk/conf/basic/pjsip_wizard.conf
similarity index 100%
rename from asterisk/conf/pjsip_wizard.conf
rename to asterisk/conf/basic/pjsip_wizard.conf
diff --git a/asterisk/conf/queues.conf b/asterisk/conf/basic/queues.conf
similarity index 96%
rename from asterisk/conf/queues.conf
rename to asterisk/conf/basic/queues.conf
index 3e3367a..aace8a9 100644
--- a/asterisk/conf/queues.conf
+++ b/asterisk/conf/basic/queues.conf
@@ -46,4 +46,4 @@ ringinuse = yes
 ;
 ; The "penalty" value is not interesting for our use case.
 ; With PJSIP, the BLF/Presence interface is identical to the standard interface name.
-member => Local/1000@to-ext,0
+member => Local/1000@to-ext,0,1000,PJSIP/1000
diff --git a/asterisk/conf/res_stun_monitor.conf b/asterisk/conf/basic/res_stun_monitor.conf
similarity index 100%
rename from asterisk/conf/res_stun_monitor.conf
rename to asterisk/conf/basic/res_stun_monitor.conf
diff --git a/asterisk/conf/voicemail.conf b/asterisk/conf/basic/voicemail.conf
similarity index 100%
rename from asterisk/conf/voicemail.conf
rename to asterisk/conf/basic/voicemail.conf