Move lines over to yate

Basic functionality should be working for incoming calls:
* Fux Intercom to 1337
* Fonial to the Hamburg number
* EPVPN

Still to do: clean up internal extensions and more extensive testing

resources/z9/yate/docker_compose/accfile.conf.j2

@@ -2,41 +2,34 @@
 ; see https://github.com/eventphone/yate/blob/master/conf.d/accfile.conf.sample
 
 [epvpn_ccchh]
-enabled=no
+enabled=yes
 protocol=sip
 description=Eventphone EPVPN CCCHH
 username=1008
 authname=1008
-password={{ secret__sip_trunk_epvpn }}
+password={{ secret__yate__sip_trunk_epvpn }}
 interval=120
 registrar=hg.eventphone.de
+keepalive=1
 
 [fonial_ccchh]
-enabled=no
+enabled=yes
 protocol=sip
 description=Fonial CCCHH
 username=fo370381tr317349_00
 authname=fo370381tr317349_00
-password={{ secret__sip_trunk_fonial }}
+password={{ secret__yate__sip_trunk_fonial }}
 interval=120
 registrar=sip.plusnet.de
+keepalive=1
 
 [fux_intercom]
-enabled=no
+enabled=yes
 protocol=sip
 description=Fux Intercom CCCHH doorbell
 username=1337
 authname=1337
-password={{ secret__sip_trunk_fux }}
+password={{ secret__yate__sip_trunk_fux }}
 interval=120
 registrar=172.16.210.2
-
-[fritzbox]
-enabled=yes
-protocol=sip
-description=yate-fritz betatest
-username=624
-authname=624
-password={{ secret__sip_trunk_fritzbox }}
-interval=120
-registrar=10.31.210.86:5060
+keepalive=1

resources/z9/yate/docker_compose/regexroute.conf.j2

@@ -7,11 +7,18 @@ route=90
 
 [contexts]
 				; INBOUND CALLS:
-^[0-9]\{4\}$=inbound		; Calls from 4 digit numbers: EPVPN
-^+\?[0-9]\{5,\}$=inbound	; Calls from longer numbers, optionally starting with +
-^*\{1,2\}[0-9]\{1,3\}$=inbound ; Internal fritzbox calls
+${called}^1337$=inbound_fux
+${called}^1008$=inbound_epvpn
+${called}^04023830150$=inbound_fonial
+${called}^fo370381tr317349_00$=inbound_fonial
+;${called}.*=inbound
+
+;^[0-9]\{4\}$=inbound		; Calls from 4 digit numbers: EPVPN
+;^+\?[0-9]\{5,\}$=inbound	; Calls from longer numbers, optionally starting with +
+;^*\{1,2\}[0-9]\{1,3\}$=inbound ; Internal fritzbox calls
 
 				; OUTBOUND CALLS:
+^[0-9]\{3\}=outbound
 ^[a-z0-9]\{4,\}=outbound	; calls from internal users
 
 ^.*$=fallback			; Whatever calls managed to not be handled yet
@@ -37,15 +44,33 @@ route=90
 
 
 [outbound]							; Calls from internal users
+^.*$=echo [outbound] "\0" ${caller}->${called}	; log for debug
+^[0-9]\{3\}$=jump internal
 ^[0-9]\{1,2\}$=jump z9						; To internal -> z9
 ^.*$=echo [outbound] "\0" ${caller}->${called}	; log for debug
-^.*$=line/\0;line=fritzbox					; Route everything (.*) to the specified accfile line
+^.*$=line/\0;line=epvpn_ccchh					; Route everything (.*) to the specified accfile line
+
+[inbound_epvpn]
+^.*$=echo [inbound_epvpn] ${caller}->${called}
+^.*$=return;callername=EPVPN ${caller};called=0	; TODO which extension do we want to route to?
+
+[inbound_fux]
+^.*$=echo [inbound_fux] ${caller}->${called}
+^.*$=return;callername=Door ${caller};called=0	; TODO which extension do we want to route to?
+
+[inbound_fonial]
+^.*$=echo [inbound_fonial] ${caller}->${called}
+^.*$=return;callername=Fonial ${caller};called=0	; TODO which extension do we want to route to?
 
 [inbound]			; Calls from EPVPN or outside world
-^.*$=echo [inbound] "\0" ${caller}->${called} user:${user} 	; log
+^.*$=echo [inbound] "\0" ${caller}->${called} user:${user} callername:${callername} callsource:${callsource} 	; log
 ^.*$=return;callername=EXTERN ${caller};called=0		; set call recipient to 0 (shared alias between 
 								;  all clients in regfile.conf
 
+[internal]
+^.*$=echo [internal] "\0" ${caller}->${called}
+^.*$=return;called=\0
+
 [z9]								; Internal calls
 ^.*$=echo [z9] "\0" ${caller}->${called}			; log
 

resources/z9/yate/docker_compose/regfile.conf.j2

@@ -4,67 +4,73 @@
 route=100
 file=/var/lib/yate/regfile.swap
 
+[610]
+password={{ secret__yate__sip_extension_fritzbox_dect1 }}
+alternatives=0,1008,1337
+callername=DECT-1
+
+[100]
+password=test100
+callername=Test 100
+
+
 [echt]
 password=test
-alternatives=0,9,91,3248
+alternatives=0,9,91,3248,1337
 
 [test]
 password=test
-alternatives=0,9,92,3248
+alternatives=0,9,92,3248,1337
 
 [unittest1]
 password=test
-alternatives=93,3248
+alternatives=93,3248,1337
+
 [unittest2]
 password=test
-alternatives=94,3248
+alternatives=94,3248,1337
 
 [door]
 password=test
-alternatives=0,1,11,3248
+alternatives=0,1,11,3248,1337
 callername=Main Door
 
 [kitchen]
 password=test
-alternatives=0,1,12,3248
+alternatives=0,1,12,3248,1337
 callername=Kitchen
 
 [desk]
 password=test
-alternatives=0,1,13,3248
+alternatives=0,1,13,3248,1337
 callername=Desk
 
 [workshop]
 password=test
-alternatives=0,2,21,3248
+alternatives=0,2,21,3248,1337
 callername=Workshop Lobby
 
 [clean]
 password=test
-alternatives=0,2,22,3248
+alternatives=0,2,22,3248,1337
 callername=Clean Workshop
 
 [dirty]
 password=test
-alternatives=0,2,23,3248
+alternatives=0,2,23,3248,1337
 callername=Dirty Workshop
 
 [dect1]
 password=test
-alternatives=0,3,31,3248
+alternatives=0,3,31,3248,1337
 callername=DECT-1
 
-[dect2]
-password=test
-alternatives=0,3,32,3248
-callername=DECT-2
-
 [analog1]
 password=test
-alternatives=0,4,41,3248
+alternatives=0,4,41,3248,1337
 callername=Analog-1
 
 [analog2]
 password=test
-alternatives=0,4,42,3248
+alternatives=0,4,42,3248,1337
 callername=Analog-2