diff --git a/extensions.conf b/extensions.conf index a206584..44aba3b 100644 --- a/extensions.conf +++ b/extensions.conf @@ -729,28 +729,20 @@ exten => _X.,n,Return() ; "core show function " will show you more information about ; one function. Remember that function names are UPPER CASE. -[telekom_incoming] -exten => s,1,Answer() -same => n,Wait(1) -same => n,Playback(/etc/asterisk/media/playback/telegott_ansage) -same => n,GotoIf($[ "${DB(stream/open)}" != "1" ]?stream-closed,1) -same => n,Goto(take-question,s,1) - -exten => stream-closed,1,Wait(0.8) -same => n,Playback(/etc/asterisk/media/playback/e_2_bei_uns_ist_leider_gerade_nichts_los) -same => n,MusicOnHold(gott,20) -same => n,Goto(1) - [from-eventphone] exten => s,1,Answer() same => n,Wait(1) -same => n,Playback(/etc/asterisk/media/playback/telegott_ansage) +same => n,Playback(/etc/asterisk/media/playback/e_1_herzlich_willkommen_beim_teleshopping) same => n,GotoIf($[ "${DB(stream/open)}" != "1" ]?stream-closed,1) -same => n,Goto(take-question,s,1) +same => n(start),Background(/etc/asterisk/media/playback/e_3_dr_cken_Sie,m) +same => n,WaitExten(4) +same => n,Goto(start) +exten => 1,1,Goto(record-bid,1,1) +exten => 2,1,Goto(take-question,s,1) exten => stream-closed,1,Wait(0.8) same => n,Playback(/etc/asterisk/media/playback/e_2_bei_uns_ist_leider_gerade_nichts_los) -same => n,MusicOnHold(gott,20) +same => n,MusicOnHold(shop,10) same => n,Goto(1) [record-bid] @@ -804,17 +796,17 @@ same => n,Dial(SIP/${EXTEN},,U(bidding-announce)) [take-question] exten => s,1,Playback(/etc/asterisk/media/playback/e_4_zur_qualit_tssicherung) same => n,Wait(0.5) -same => n,Queue(gott,t) +same => n,Queue(shop,t) same => n,Hangup() [local] exten => _22X,1,Dial(SIP/${EXTEN:1}) -;same => n,Hangup +same => n,Hangup -;exten => _X.,1,Dial(IAX2/hetzner/${EXTEN}) -;same => n,Hangup +exten => _X.,1,Dial(IAX2/hetzner/${EXTEN}) +same => n,Hangup -;[oldlocal] +[oldlocal] exten => _0X.,1,Goto(to-eventphone,${EXTEN:1},1) ; Open bidding, read start bid @@ -856,10 +848,10 @@ same => n,Playback(/etc/asterisk/media/playback/e_15.2_herzlichen_gl_ckwunsch_p same => n,Hangup() [to-eventphone] -exten => _X.,1,SET(CALLERID(all)="Telegott" <7467>) +exten => _X.,1,SET(CALLERID(all)="Teleshop" <7467>) same => n,Dial(SIP/${EXTEN}@eventphone) -;[fromhetzner] -;exten => _2X,1,Originate(Console/dsp,exten,auction-spy,s,1,,a) -;same => n,Dial(SIP/${EXTEN}) -;same => n,Hangup() +[fromhetzner] +exten => _2X,1,Originate(Console/dsp,exten,auction-spy,s,1,,a) +same => n,Dial(SIP/${EXTEN}) +same => n,Hangup() diff --git a/media/moh/gott/Telegott_Loop_Warteschlange.alaw b/media/moh/gott/Telegott_Loop_Warteschlange.alaw deleted file mode 100644 index a6897da..0000000 Binary files a/media/moh/gott/Telegott_Loop_Warteschlange.alaw and /dev/null differ diff --git a/media/playback/ansage.alaw b/media/playback/ansage.alaw deleted file mode 100644 index 3986a9e..0000000 Binary files a/media/playback/ansage.alaw and /dev/null differ diff --git a/media/playback/telegott_ansage.alaw b/media/playback/telegott_ansage.alaw deleted file mode 100644 index 0c4b6f2..0000000 Binary files a/media/playback/telegott_ansage.alaw and /dev/null differ diff --git a/musiconhold.conf b/musiconhold.conf index 6b9577b..329ac61 100644 --- a/musiconhold.conf +++ b/musiconhold.conf @@ -52,10 +52,6 @@ directory=/etc/asterisk/media/moh/shop [shop] mode=files directory=/etc/asterisk/media/moh/shop - -[gott] -mode=files -directory=/etc/asterisk/media/moh/gott ; ;[native-random] ;mode=files diff --git a/queues.conf b/queues.conf index 5ac5c4f..b00fd53 100644 --- a/queues.conf +++ b/queues.conf @@ -586,12 +586,3 @@ queue-thereare=/etc/asterisk/media/playback/e_17_du_bist_nicht_h_chstbietend ; ("calls waiting.") queue-callswaiting=/etc/asterisk/media/playback/e_19_dr_cke_1_um_erneut_zu_bieten ; ("The current est. holdtime is") - -[gott] -musicclass=gott -strategy=ringall -announce-position=no -announce-to-first-user=no -member => SIP/21 -member => SIP/22 -member => SIP/23 diff --git a/sip.conf b/sip.conf index fbed09c..e4b325f 100644 --- a/sip.conf +++ b/sip.conf @@ -819,8 +819,7 @@ qualify=yes ; ;register => 1234:password@mysipprovider.com -register => 7467:12zX22bH02q2@eventphone.de -register => 04043095296:23554274:551135893074-0001@t-online.de@tel.t-online.de +;register => 7467:12zX22bH02q2@eventphone.de ;register => 7467:COwcNVlnErGf@voip.eventphone.de ; @@ -1625,38 +1624,21 @@ directrtpsetup=no ; Enable the new experimental direct RTP setup. Th ; external IP address of the remote device. If port forwarding is done at the client side ; then UDPTL will flow to the remote device. -[eventphone] -type=friend -host=148.251.63.154 -defaultuser=7467 -secret=12zX22bH02q2 -context=from-eventphone -qualify=yes -disallow=all -allow=alaw -direct-media=no -canrewrite=no -dtmfmode=rfc2833 -insecure=invite,port -qualify=yes - - -[telekom_in] -type=peer -context=telekom_incoming -insecure=invite -host=tel.t-online.de -fromdomain=tel.t-online.de -canreinvite=no - -[telekom_out] -type=peer -defaultuser=551135893074-0001@tel.t-online.de -secret=23554274 -host=tel.t-online.de -fromdomain=tel.t-online.de -canreinvite=no - +;[eventphone] +;type=friend +;host=148.251.63.154 +;defaultuser=7467 +;secret=12zX22bH02q2 +;context=from-eventphone +;qualify=yes +;disallow=all +;allow=alaw +;direct-media=no +;canrewrite=no +;dtmfmode=rfc2833 +;insecure=invite,port +;qualify=yes +; ;[eventphone-event] ;type=friend ;host=93.180.79.35