Restart hinzugefügt

adguard/conf/AdGuardHome.yaml

@@ -39,8 +39,7 @@ dns:
     - 8.8.8.8
     - 8.8.4.4
   fallback_dns: []
-  all_servers: false
+  upstream_mode: load_balance
-  fastest_addr: false
   fastest_timeout: 1s
   allowed_clients: []
   disallowed_clients: []
@@ -183,16 +182,15 @@ user_rules:
   - /^r[0-9]-*sn-[a-z0-9]*-[0-9a-z]{4}\.googlevideo\.com/
   - /^r[0-9]{1,2}-*sn-[a-z0-9]*-[0-9a-z]{4}.googlevideo.com/
   - /^rr[0-9]-*sn-[a-z0-9]*-[0-9a-z]{4}\.googlevideo\.com/
+  - '##'
+  - '# PandaSecurity'
+  - '##'
+  - '||eventtrack.pandasecurity.com^$important'
+  - '#####'
+  - '# sonstige sperren'
+  - '#####'
   - '@@||ad.doubleclick.net^$important'
   - '@@||app-measurement.com^$important'
-  - '!@@||www.googletagmanager.com^$important'
-  - '!@@||www.google-analytics.com^$important'
-  - '!@@||as.bild.de^$important'
-  - '!@@||axelspringerse.demdex.net^$important'
-  - '!@@||adnxs-simple.com^$important'
-  - '!@@||a.hstrck.com^$important'
-  - '!@@||cdn.cxense.com^$important'
-  - '!@@||cm.everesttech.net^$important'
   - '@@||benefits.sovendus.com^$important'
   - '@@||fhdi3gj7.r.us-east-1.awstrack.me^$important'
   - '@@||t.notifications.groupe-pvcp.com^$important'
@@ -207,7 +205,10 @@ user_rules:
   - '@@||as.bild.de^$important'
   - '@@||click.cptrack.de^$important'
   - '@@||lavieenrose.com^$important'
-  - '||eventtrack.pandasecurity.com^$important'
+  - '@@||fast.skydeutschland.demdex.net^$client=''ROG'''
+  - '@@||email.golfpost.de^$important'
+  - '@@||adservice.google.com^$important'
+  - '@@||rd.bizrate.com^$important'
   - '@@||telemetry-in.battle.net^$important'
   - '#'
   - '## Sperre für Luminar '
@@ -215,26 +216,6 @@ user_rules:
   - '||auth.macphun.com^$important'
   - '||luminar3win.update.skylum.com^$important'
   - '||luminar3.s3-accelerate.amazonaws.com^$important'
-  - '||luminar4win.update.skylum.com^$important'
-  - '||luminar4.s3-accelerate.amazonaws.com^$important'
-  - '||stats-api.skylum.com^$important'
-  - '||geotargetly-1a441.appspot.com^$important'
-  - '||fx.macphun.com^$important'
-  - '||canonicalizer.ucsuri.tcs^$important'
-  - '||auth.macphun.com^$important'
-  - '||stats-api.skylum.com^$important'
-  - '||api.photolemur.com^$important'
-  - '||media.macphun.com^$important'
-  - '||luminaraiwin.skylum.com^$important'
-  - '||luminarneowin.skylum.com^$important'
-  - '@@||fast.skydeutschland.demdex.net^$client=''ROG'''
-  - '||shepherd.ff.avast.com^$important'
-  - '||analytics.ff.avast.com^$important'
-  - '||v7event.stats.avast.com^$important'
-  - '||ncc.avast.com^$important'
-  - '@@||email.golfpost.de^$important'
-  - '@@||adservice.google.com^$important'
-  - '@@||rd.bizrate.com^$important'
   - ""
 dhcp:
   enabled: false
@@ -308,6 +289,7 @@ clients:
         - 192.168.0.51
       tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-71e0-9a76-f7f93da1e64d
       upstreams_cache_size: 0
       upstreams_cache_enabled: false
       use_global_settings: false
@@ -334,6 +316,7 @@ clients:
         - 192.168.0.56
       tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-7d6c-a1d4-2f005d7c17ab
       upstreams_cache_size: 0
       upstreams_cache_enabled: false
       use_global_settings: true
@@ -360,6 +343,7 @@ clients:
         - 192.168.0.1
       tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-7f8d-95fe-fcfe6d363a29
       upstreams_cache_size: 0
       upstreams_cache_enabled: false
       use_global_settings: false
@@ -386,6 +370,7 @@ clients:
         - 192.168.0.59
       tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-7739-bbc2-bf9b979f9913
       upstreams_cache_size: 0
       upstreams_cache_enabled: false
       use_global_settings: false
@@ -412,6 +397,7 @@ clients:
         - 192.168.0.98
       tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-741f-9824-85cdb1315521
       upstreams_cache_size: 0
       upstreams_cache_enabled: false
       use_global_settings: false
@@ -438,6 +424,7 @@ clients:
         - 192.168.0.58
       tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-70b1-8f0b-e7be87a33423
       upstreams_cache_size: 0
       upstreams_cache_enabled: false
       use_global_settings: false
@@ -464,6 +451,7 @@ clients:
         - 192.168.0.42
       tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-7e3c-a8e5-2d70f8580abb
       upstreams_cache_size: 0
       upstreams_cache_enabled: false
       use_global_settings: false
@@ -490,6 +478,7 @@ clients:
         - 192.168.0.60
       tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-7acf-aa55-c000293947bc
       upstreams_cache_size: 0
       upstreams_cache_enabled: false
       use_global_settings: false
@@ -516,6 +505,7 @@ clients:
         - 192.168.0.62
       tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-7fb5-a762-4f4599510a9d
       upstreams_cache_size: 0
       upstreams_cache_enabled: false
       use_global_settings: false
@@ -542,6 +532,7 @@ clients:
         - 192.168.0.46
       tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-729a-a02b-bb7bd6c6340f
       upstreams_cache_size: 0
       upstreams_cache_enabled: false
       use_global_settings: true
@@ -563,4 +554,4 @@ os:
   group: ""
   user: ""
   rlimit_nofile: 0
-schema_version: 27
+schema_version: 28

adguard/docker-compose.yml

@@ -2,11 +2,14 @@ version: '3.7'
 services:
   adguardhome:
     container_name: adguardhome
+    hostname: adguardhome
     image: adguard/adguardhome:latest
     volumes:
       - ./work:/opt/adguardhome/work
       - ./conf:/opt/adguardhome/conf
       - /etc/localtime:/etc/localtime:ro
+    cap_add:
+      - NET_ADMIN
     ports:
       - 53:53/tcp
       - 53:53/udp

dozzle/docker-compose.yml

@@ -6,4 +6,5 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     ports:
-      - 9999:8080
+      - 9999:8080
+    restart: unless-stopped

homeassistant/docker-compose.yml

@@ -10,10 +10,8 @@ services:
     devices:
       - /dev/ttyACM0:/dev/ttyACM0
     ports:
-      - "192.168.0.111:8123:8123"
+      - 8123:8123
     privileged: true
     environment:
       - TZ=Europe/Berlin
-#    labels:
-#      - "com.centurylinklabs.watchtower.monitor-only=true"
     restart: unless-stopped

knxd/docker-compose.yml

@@ -12,8 +12,8 @@ services:
 
 #
 # mit logging, wenn es zu Problemen kommt
-#      command: knxd -e 1.1.250 -E 1.1.210:10 -f9 -t1023 -DTRS -c -B single --send-delay=60 -b ipt:192.168.0.200
+      command: knxd -e 1.1.250 -E 1.1.210:10 -f6 -t1023 -DTRS -c -B single --send-delay=70 -b ipt:192.168.0.200
 #
 # ohne logging -i deaktiviert zum testen
 #
-      command: knxd -e 1.1.250 -E 1.1.210:8 -DTRS -c -B single --send-delay=60 -b ipt:192.168.0.200
+#      command: knxd -e 1.1.250 -E 1.1.210:8 -DTRS -c -B single --send-delay=30 -b ipt:192.168.0.200

vdr/config/channels.conf

@@ -45,7 +45,7 @@ NDR FS MV HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5221=27:5222=deu@3,5223=mis@3,
 NDR FS HH HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5221=27:5222=deu@3,5223=mis@3,5227=qks@3;5226=deu@106:5224;5245=deu:0:10329:1:1025:0
 rbb Brandenburg HD;ARD:10891:HC23M5O35P0S1:S19.2E:22000:5311=27:5312=deu@3,5313=mis@3,5317=qks@3;5316=deu@106:5314;5315=deu:0:10350:1:1061:0
 rbb Berlin HD;ARD:10891:HC23M5O35P0S1:S19.2E:22000:5311=27:5312=deu@3,5313=mis@3,5317=qks@3;5316=deu@106:5314;5315=deu:0:10351:1:1061:0
-MDR Sachsen HD;ARD:10891:HC23M5O35P0S1:S19.2E:22000:5321=27:5322=deu@3,5323=mis@3,5327=qks@3;5326=deu@106:5324;5325=deu:0:10352:1:1061:0
+MDR Sachsen HD;ARD:10891:HC23M5O35P0S1:S19.2E:22000:5331=27:5332=deu@3,5333=mis@3,5337=qks@3;5336=deu@106:5334;5335=deu:0:10352:1:1061:0
 MDR S-Anhalt HD;ARD:10891:HC23M5O35P0S1:S19.2E:22000:5331=27:5332=deu@3,5333=mis@3,5337=qks@3;5336=deu@106:5334;5335=deu:0:10353:1:1061:0
 MDR Thüringen HD;ARD:10891:HC23M5O35P0S1:S19.2E:22000:5331=27:5332=deu@3,5333=mis@3,5337=qks@3;5336=deu@106:5334;5335=deu:0:10354:1:1061:0
 SR Fernsehen;ARD:12265:HC34M2S0:S19.2E:27500:1301=2:1302=deu@3,1303=mis@3:1304:0:28486:1:1093:0
@@ -178,7 +178,7 @@ COSMO;ARD WDR:11052:HC23M5O35P0S1:S19.2E:22000:0:651=deu@17:0:0:10456:1:1039:0
 Die Maus;ARD WDR:11052:HC23M5O35P0S1:S19.2E:22000:0:671=deu@17:0:0:10458:1:1039:0
 WDR Event;ARD WDR:11052:HC23M5O35P0S1:S19.2E:22000:0:681=deu@17:0:0:10459:1:1039:0
 .;SES ASTRA:11111:HC23M5O35P0S1:S19.2E:22000:0:0:0:0:12501:1:1043:0
-Eurosport 1 HD;SES ASTRA:11111:HC23M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106:33:1830,1860,1843,98C,9C4,186A,186D,98D,1842,4B64,4AF4:12502:1:1043:0
+Eurosport 1 HD;SES ASTRA:11111:HC23M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106:0:1830,1860,1843,98C,9C4,186A,186D,98D,1842,4B64,4AF4:12502:1:1043:0
 .;SES ASTRA:11111:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:0:1830,1843,1860,186A,186D,1842,4B64,4AF4:12503:1:1043:0
 .;SES ASTRA:11111:HC23M5O35P0S1:S19.2E:22000:0:0:0:0:12510:1:1043:0
 SAT.1 Gold HD Austria;ProSiebenSat.1:11111:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:9C4,98C,500,6E2,98D:12520:1:1043:0
@@ -256,16 +256,16 @@ sixx HD Austria;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=d
 Pro7 MAXX HD Austria;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106:36:9C4,98C,500,6E2,98D:61324:1:1017:0
 Kabel 1 Doku HD Austria;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:1535=27:0;1539=deu@106:37:9C4,98C,98D,500,6E2:61325:1:1017:0
 WDR HD Köln;ARD:11523:HC23M5O35P0S1:S19.2E:22000:101=27:102=deu@3,103=mis@3,107=qks@3;106=deu@106:104;105=deu:0:28332:1:1021:0
-WDR HD Aachen;ARD:11523:HC23M5O35P0S1:S19.2E:22000:101=27:102=deu@3,103=mis@3,107=qks@3;106=deu@106:104;105=deu:0:28333:1:1021:0
+WDR HD Aachen;ARD:11523:HC23M5O35P0S1:S19.2E:22000:111=27:112=deu@3:104;105=deu:0:28333:1:1021:0
-WDR HD Bielefeld;ARD:11523:HC23M5O35P0S1:S19.2E:22000:101=27:102=deu@3,103=mis@3,107=qks@3;106=deu@106:104;105=deu:0:28334:1:1021:0
+WDR HD Bielefeld;ARD:11523:HC23M5O35P0S1:S19.2E:22000:121=27:122=deu@3:104;105=deu:0:28334:1:1021:0
-WDR HD Bonn;ARD:11523:HC23M5O35P0S1:S19.2E:22000:101=27:102=deu@3,103=mis@3,107=qks@3;106=deu@106:104;105=deu:0:28335:1:1021:0
+WDR HD Bonn;ARD:11523:HC23M5O35P0S1:S19.2E:22000:131=27:132=deu@3:104;105=deu:0:28335:1:1021:0
-WDR HD Dortmund;ARD:11523:HC23M5O35P0S1:S19.2E:22000:101=27:102=deu@3,103=mis@3,107=qks@3;106=deu@106:104;105=deu:0:28336:1:1021:0
+WDR HD Dortmund;ARD:11523:HC23M5O35P0S1:S19.2E:22000:141=27:142=deu@3:104;105=deu:0:28336:1:1021:0
-WDR HD Duisburg;ARD:11523:HC23M5O35P0S1:S19.2E:22000:101=27:102=deu@3,103=mis@3,107=qks@3;106=deu@106:104;105=deu:0:28337:1:1021:0
+WDR HD Duisburg;ARD:11523:HC23M5O35P0S1:S19.2E:22000:151=27:152=deu@3:104;105=deu:0:28337:1:1021:0
-WDR HD Düsseldorf;ARD:11523:HC23M5O35P0S1:S19.2E:22000:101=27:102=deu@3,103=mis@3,107=qks@3;106=deu@106:104;105=deu:0:28338:1:1021:0
+WDR HD Düsseldorf;ARD:11523:HC23M5O35P0S1:S19.2E:22000:161=27:162=deu@3:104;105=deu:0:28338:1:1021:0
-WDR HD Essen;ARD:11523:HC23M5O35P0S1:S19.2E:22000:101=27:102=deu@3,103=mis@3,107=qks@3;106=deu@106:104;105=deu:0:28339:1:1021:0
+WDR HD Essen;ARD:11523:HC23M5O35P0S1:S19.2E:22000:171=27:172=deu@3:104;105=deu:0:28339:1:1021:0
-WDR HD Münster;ARD:11523:HC23M5O35P0S1:S19.2E:22000:101=27:102=deu@3,103=mis@3,107=qks@3;106=deu@106:104;105=deu:0:28340:1:1021:0
+WDR HD Münster;ARD:11523:HC23M5O35P0S1:S19.2E:22000:181=27:182=deu@3:104;105=deu:0:28340:1:1021:0
-WDR HD Siegen;ARD:11523:HC23M5O35P0S1:S19.2E:22000:101=27:102=deu@3,103=mis@3,107=qks@3;106=deu@106:104;105=deu:0:28341:1:1021:0
+WDR HD Siegen;ARD:11523:HC23M5O35P0S1:S19.2E:22000:191=27:192=deu@3:104;105=deu:0:28341:1:1021:0
-WDR HD Wuppertal;ARD:11523:HC23M5O35P0S1:S19.2E:22000:101=27:102=deu@3,103=mis@3,107=qks@3;106=deu@106:104;105=deu:0:28342:1:1021:0
+WDR HD Wuppertal;ARD:11523:HC23M5O35P0S1:S19.2E:22000:201=27:202=deu@3:104;105=deu:0:28342:1:1021:0
 WDR Test-R;ARD:11523:HC23M5O35P0S1:S19.2E:22000:0:0:0:0:28354:1:1021:0
 WDR Mediathek (Internet);ARD:11523:HC23M5O35P0S1:S19.2E:22000:331=36:332=deu@17,333=deu@17:0:0:28370:1:1021:0
 a.tv HD;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1010=27:1012=deu@3:0:0:5800:1:1023:0
@@ -337,7 +337,7 @@ Sky Sport Premier League HD OBSOLETE,Sky Sport PL HD;OBSOLETE SKY:11170:HC34M5O3
 Canal Algerie;SES ASTRA:12544:HC56M2S0:S19.2E:22000:515=2:680=fra@4:0:0:12137:1:1108:0
 Algerie 3;SES ASTRA:12544:HC56M2S0:S19.2E:22000:514=2:670=fra@4:0:0:12138:1:1108:0
 SBN International;SES ASTRA:12544:HC56M2S0:S19.2E:22000:2001=2:3001=@4,4001=@4:5001:0:12186:1:1108:0
-CANAL+;CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2510=36:0;2521=fra@106,2522=qaa@106,2523=qad@106:0;2542=fra,2542=fra,2543=fra,2543=fra:0:9825:1:1120:0
+CANAL+;CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2510=36:0;2521=fra@106,2522=qaa@106,2523=qad@106:0;2542=fra,2542=fra,2543=fra,2543=fra:1883:9825:1:1120:0
 EVENEMENT SPORT 4K UHD;CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2610=36:0;2621=fra@106:0;2642=fra,2643=fra:1883:9826:1:1120:0
 SWR2 5.1;ARD SWR:11052:HC23M5O35P0S1:S19.2E:22000:0:581=deu@17:0:0:10448:1:1039:0
 Service 13231;ORS:11243:HC56M2S0:S19.2E:22000:0:0:0:0:13231:1:1003:0
@@ -356,14 +356,14 @@ Sky Sport 2 HD,Sky Sport 2 HD;SKY:11171:HC34M5O20P0S1:S19.2E:22000:0:0:0:0:278:1
 Crime + Investigation,CI;SKY:11171:HC34M5O20P0S1:S19.2E:22000:0:0:0:0:402:133:2:0
 Sky Sport Mix HD,Sky Sport M HD;SKY:11171:HC34M5O20P0S1:S19.2E:22000:0:0:0:0:141:133:2:0
 Sky Sport Austria 3 HD,Sky Austria 3 HD;SKY:11171:HC34M5O20P0S1:S19.2E:22000:0:0:0:0:339:133:2:0
-Sky Sport F1 HD,Sport F1 HD;SKY:11171:HC34M5O35P0S1:S19.2E:22000:1791=27:0;1794=qae@106:32:9C4,98C,98D,9F0:17:133:9:0
+Sky Sport F1 HD,Sport F1 HD;SKY:11171:HC34M5O35P0S1:S19.2E:22000:1791=27:0;1794=qae@106,1796=qaf@106:32:9C4,98C,98D,9F0:17:133:9:0
 DAZN 2 HD,DAZN2HD;SKY:11171:HC34M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106:0:9C4,98C,9F0,98D:122:133:9:0
 Beate Uhse HD,BeateUhseHD;SKY:11171:HC34M5O35P0S1:S19.2E:22000:2047=27:0;2051=deu@106:0:9C4,98C,98D,9F0:133:133:9:0
 Sky Sport Bundesliga 6 HD,Sky Buli 6 HD;SKY:11171:HC34M5O35P0S1:S19.2E:22000:6655=27:0;6658=qab@106,6660=qac@106:32:9C4,98C,98D,9F0:317:133:9:0
 Sky Sport Austria 5 HD,Sky Austria 5 HD;SKY:11171:HC34M5O35P0S1:S19.2E:22000:5119=27:0;5122=qae@106:0:9C4,98C,98D,9F0:326:133:9:0
 Sky Cinema Fun HD,Sky Fun HD;SKY:11171:HC34M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106,1028=eng@106:0:9C4,98C,98D,9F0:8:133:9:0
 Sky Sport Bundesliga 7 HD,Sky Buli 7 HD;SKY:11171:HC34M5O35P0S1:S19.2E:22000:4351=27:0;4354=qab@106:32:9C4,98C,98D,9F0:327:133:9:0
-Sky Sport 7 HD,Sky Sport 7 HD;SKY:11171:HC34M5O35P0S1:S19.2E:22000:4607=27:0;4610=qae@106:32:9C4,98C,98D,9F0:328:133:9:0
+Sky Sport 7 HD,Sky Sport 7 HD;SKY:11171:HC34M5O35P0S1:S19.2E:22000:4607=27:0;4610=qae@106,4612=qaf@106:32:9C4,98C,98D,9F0:328:133:9:0
 Sky Sport 6 HD,Sky Sport 6 HD;SKY:11171:HC34M5O35P0S1:S19.2E:22000:6911=27:0;6914=qae@106,6916=qaf@106:32:9C4,98C,98D,9F0:318:133:9:0
 Xplore;SES:12603:HC56M2S0:S19.2E:22000:255=27:256=deu@3:0:0:10550:1:1112:0
 Hip Trips;SES:12603:HC56M2S0:S19.2E:22000:511=27:512=deu@3:0:0:10551:1:1112:0
@@ -379,3 +379,4 @@ Red Adventure;SES:12603:HC56M2S0:S19.2E:22000:2815=27:2816=deu@3:0:0:10560:1:111
 Crime Time;SES:12603:HC56M2S0:S19.2E:22000:3071=27:3072=deu@3:0:0:10561:1:1112:0
 SERIEN+;SES:12603:HC56M2S0:S19.2E:22000:3327=27:3328=deu@3:0:0:10562:1:1112:0
 BILD HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:2303=27:0:0:0:10108:1:1033:0
+RiC;-:11302:HC23M5O35P0S1:S19.2E:22000:1930=27:1931=deu@3:0:0:4930:1:1007:0

vdr/config/setup.conf

@@ -163,6 +163,7 @@ markad.SecondPass = 1
 markad.Verbose = 0
 markad.whileRecording = 1
 markad.whileReplaying = 1
+streamdev-server.SuspendMode = 1
 streamdev-server.AllowSuspend = 1
 streamdev-server.HideMenuEntry = 0
 streamdev-server.HTTPBindIP = 0.0.0.0
@@ -173,14 +174,14 @@ streamdev-server.IGMPBindIP = 0.0.0.0
 streamdev-server.IGMPClientPort = 1234
 streamdev-server.IGMPPriority = 0
 streamdev-server.IGMPStreamType = 0
-streamdev-server.LiveBufferMs = 500
+streamdev-server.LiveBufferMs = 1500
 streamdev-server.LoopPrevention = 0
-streamdev-server.MaxClients = 12
+streamdev-server.MaxClients = 5
 streamdev-server.ServerPort = 2004
-streamdev-server.StartHTTPServer = 1
+streamdev-server.StartHTTPServer = 0
 streamdev-server.StartIGMPServer = 0
 streamdev-server.StartServer = 1
 streamdev-server.StartSuspended = 1
 streamdev-server.VTPBindIP = 0.0.0.0
 streamdev-server.VTPPriority = 1
-vnsiserver.TimeshiftBufferDir = /vdr/timeshift
+vnsiserver.TimeshiftBufferDir = /vdr/timeshift