ast: move basic config to own folder

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()
 

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