Kanäle angepasst

adguard/conf/AdGuardHome.yaml

@@ -14,11 +14,6 @@ dns:
   bind_hosts:
     - 0.0.0.0
   port: 53
-  statistics_interval: 1
-  querylog_enabled: true
-  querylog_file_enabled: true
-  querylog_interval: 24h
-  querylog_size_memory: 1000
   anonymize_client_ip: false
   protection_enabled: true
   blocking_mode: default
@@ -65,7 +60,10 @@ dns:
   bogus_nxdomain: []
   aaaa_disabled: true
   enable_dnssec: true
-  edns_client_subnet: false
+  edns_client_subnet:
+    custom_ip: ""
+    enabled: false
+    use_custom: false
   max_goroutines: 300
   handle_ddr: true
   ipset: []
@@ -104,6 +102,16 @@ tls:
   certificate_path: ""
   private_key_path: ""
   strict_sni_check: false
+querylog:
+  enabled: true
+  file_enabled: true
+  interval: 24h
+  size_memory: 1000
+  ignored: []
+statistics:
+  enabled: true
+  interval: 1
+  ignored: []
 filters:
   - enabled: true
     url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
@@ -199,7 +207,7 @@ user_rules:
   - '@@||benefits.sovendus.com^$important'
   - '@@||fhdi3gj7.r.us-east-1.awstrack.me^$important'
   - '@@||t.notifications.groupe-pvcp.com^$important'
-  - ""
+  - '@@||metrics.brightcove.com^$important'
 dhcp:
   enabled: false
   interface_name: eth0
@@ -240,7 +248,7 @@ clients:
     - name: FireTV-WZ
       tags: []
       ids:
-        - 192.168.0.34
+        - 192.168.0.56
       blocked_services: []
       upstreams: []
       use_global_settings: true
@@ -320,4 +328,4 @@ os:
   group: ""
   user: ""
   rlimit_nofile: 0
-schema_version: 14
+schema_version: 17

reverse-proxy/docker-compose.yml

@@ -17,6 +17,8 @@ services:
     volumes:
       - ./data:/data
       - ./letsencrypt:/etc/letsencrypt
+    depends_on:
+      - db
   db:
     image: 'jc21/mariadb-aria:latest'
     container_name: nginx_db

vdr/config/channels.conf

@@ -18,7 +18,7 @@ ATV HD;ATV:11243:HC56M2S0:S19.2E:22000:2280=27:2281=deu@3:2285:648,650,D95,D98,5
 :->Doku
 ntv HD;CBC:10832:HC23M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106,1284=mul@106:36:1830,1843,1860,98C,9C4,648,650,186A,500,186D,6E2,98D:61204:1:1057:0
 phoenix HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5261=27:5262=deu@3,5263=mul@3:5264:0:10331:1:1025:0
-WELT HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:767=27:0;771=deu@106:34:1830,1843,9C4,98C,648,1860,186A,98D,186D,1842,4B64,4AF4:21108:1:1053:0
+WELT HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:767=27:0;771=deu@106:0:1830,1843,9C4,98C,648,1860,186A,98D,186D,1842,4B64,4AF4:21108:1:1053:0
 Kabel Eins Doku HD;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:1535=27:0;1539=deu@106:37:1830,1843,9C4,98C,1860,186A,98D,186D,1842,4B64,4AF4:61305:1:1017:0
 :->Kinder
 .;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:511=27:0;515=deu@106,516=deu@106:0:9C4,98C,648,650,500,6E2,98D:21117:1:1053:0
@@ -292,7 +292,7 @@ CGTN Documentary HD;GLOBECAST:12515:HC56M2S0:S19.2E:22000:6821=27:6822=@3:0:0:68
 CGTN Francais HD;GLOBECAST:12515:HC56M2S0:S19.2E:22000:6831=27:6832=@3:0:0:6803:1:1106:0
 QVC2;SES ASTRA:12544:HC56M2S0:S19.2E:22000:168=2:144=deu@3:146:0:3394:1:1108:0
 QVC Deutschland;SES ASTRA:12544:HC56M2S0:S19.2E:22000:165=2:166=deu@3:167:0:12100:1:1108:0
-Bibel TV;HMS GmbH:12544:HC56M2S0:S19.2E:22000:33=2:34=deu@3:36:0:12122:1:1108:0
+Bibel TV;MTI:12544:HC56M2S0:S19.2E:22000:33=2:34=deu@3:36:0:12122:1:1108:0
 Cherie 25;SES ASTRA:12544:HC56M2S0:S19.2E:22000:5301=27:0;5302=fra@106,5303=eng@106,5304=qad@106:0;5305=fra,5306=fra:500,1883,1863,1811:12140:1:1108:0
 Cherie 25;SES ASTRA:12544:HC56M2S0:S19.2E:22000:5301=27:0;5302=fra@106,5303=eng@106,5304=qad@106:0;5305=fra,5306=fra:500,1883,1863,1811:12141:1:1108:0
 NRJ 12;SES ASTRA:12544:HC56M2S0:S19.2E:22000:5501=27:0;5502=fra@106,5503=eng@106,5504=qad@106:0;5505=fra,5506=fra:500,1811,1883,1863:12145:1:1108:0
@@ -301,7 +301,7 @@ ShopLC HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:511=27:512=deu@3,513=eng@
 SES 75;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:0:0:0:0:21111:1:1053:0
 Nicer Dicer TV;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:3071=27:3072=deu@3:0:0:21112:1:1053:0
 Genius Plus;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:3327=27:3328=deu@3:0:0:21113:1:1053:0
-WELT HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:767=27:0;771=deu@106:34:9C4,98C,648,650,500,98D:21118:1:1053:0
+WELT HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:767=27:0;771=deu@106:0:9C4,98C,648,650,500,98D:21118:1:1053:0
 tagesschau24;ARD:10743:HC56M2S0:S19.2E:22000:101=2:102=deu@3:0:0:28721:1:1051:0
 ONE;ARD:10743:HC56M2S0:S19.2E:22000:201=2:202=deu@3:0:0:28722:1:1051:0
 arte;ARD:10743:HC56M2S0:S19.2E:22000:401=2:402=deu@3:0:0:28724:1:1051:0
@@ -333,7 +333,7 @@ F3 RHONE ALPES OBSOLETE;OBSOLETE CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2310=27:0
 F3 FRANCHE COMTE OBSOLETE;OBSOLETE CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2410=27:0;2421=fra@106:0:1811,1863,1883,500:9824:1:1120:0
 AutoMotorSport HD temp OBSOLETE;OBSOLETE BetaDigital:10920:HC78M2S0:S19.2E:22000:2815=27:2816=deu@3,2817=bul@3,2818=cze@3,2819=hun@3:0;2821=ron:1837,624,D96,1817,1818,B02,100,500,1867,653,181D:34:133:15:0
 Sky Sport Mix HD,Sky Sport M HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:255=27:0;258=qae@106,260=qaf@106:0:9C4,98C,98D:141:133:9:0
-Sky Sport Premier League HD,Sky Sport PL HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:3839=27:0;3842=qae@106,3844=qaf@106:0:9C4,98D,98C:145:133:9:0
+Sky Sport Premier League HD,Sky Sport PL HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:3839=27:0;3842=qae@106:0:9C4,98D,98C:145:133:9:0
 Canal Algerie;TDA:12544:HC56M2S0:S19.2E:22000:515=2:680=fra@4:0:0:12137:1:1108:0
 Algerie 3;TDA:12544:HC56M2S0:S19.2E:22000:514=2:670=fra@4:0:0:12138:1:1108:0
 SBN International;SES:12544:HC56M2S0:S19.2E:22000:2001=2:3001=@4,4001=@4:5001:0:12186:1:1108:0

vdr/config/plugins/epgsearch/epgsearch.conf

@@ -10,7 +10,7 @@
 27:Get the F*ck out of my House:1:2000:2200:1:S19.2E-1-1017-61301:0:0:1:1:1:0:::1:1:-16:1::50:99:2:10:0:0:0::0:0:0:0:0:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
 28:Sekretärinnen:0:::1:S19.2E-1-1057-61200:0:0:1:1:1:0:::1:1:-16:1::50:99:2:10:0:0:0::1:0:0:1:0:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
 33:Akte X:1:2000:2300:1:S19.2E-1-1017-61301:0:0:1:1:1:0:::1:0:0:1::50:99:2:10:0:0:0::1:0:0:0:1:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
-34:The Orville:0:::0:0:0:0:1:1:1:0:::1:0:0:1::50:99:2:10:0:0:0::1:0:0:0:1:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
+34:The Orville:1:2000:2359:1:S19.2E-1-1017-61301:0:0:1:1:1:0:::1:0:0:1::50:99:2:10:0:0:0::1:0:0:0:1:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
 35:Einstein:1:2000:2300:1:S19.2E-1-1017-61300:0:0:1:1:1:0:::1:1:-4:1::50:99:2:10:0:0:0::0:0:0:0:0:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
 37:Jenny - echt gerecht!:1:2000:2300:1:S19.2E-1-1057-61200:0:0:1:1:1:0:::1:1:-4:1::50:99:2:10:0:0:0::0:0:0:0:0:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
 38:jerks.:1:2000:0000:1:S19.2E-1-1017-61301:0:0:1:1:1:0:::1:1:-4:1::50:99:2:10:0:0:0::0:0:0:0:0:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0

vdr/docker-compose.yml

@@ -39,4 +39,4 @@ volumes:
     driver_opts:
       type: nfs
       o: addr=${NFS_SERVER},rw
-      device: ":${PFAD}"
+      device: ":${PFAD}"