Containerquelle auf php:8.3 geändert

Readme angepasst

README.md

@@ -1,13 +1,17 @@
-## Docker-Compose Files Borgals HomeLab
+<H1>Docker-Compose Files Borgals HomeLab</H1>
+<p></p>
+<p></p>
+<img src="https://tcude.net/content/images/size/w2000/2022/01/MainImage-2.jpeg" alt="Docker-Compose" width="400" />
+<p></p>
+<p></p>
 
+<H2>Environment Variablen</H2>
 
-### Environment Variablen
+- **Benutzernamen** und **Passwörter**, sowie weitere Variablen sind in einer .env Datei ausgelagert
+- die **.env.sample** muss jeweils in **.env** umbenannt werden und die Variablen darin auf deine Bedürfnisse angepasst werden
 
-- Benutzernamen und Passwörter, sowie weitere Variablen sind in einer .env Datei ausgelagert
-- die .env.sample muss jeweils in .env umbenannt werden und die Variablen darin auf deine Bedürfnisse angepasst werden
+----
 
+<H2>Reverse Proxy</H2>
 
-### Reverse Proxy
-
-- als Reverse Proxy setze ich den Nginx Proxy Manager ein, daher sind keine Labels für Träfik vorhanden
- 
+- als **Reverse Proxy** setze ich den Nginx Proxy Manager ein, daher sind keine Labels für Träfik vorhanden

adguard/conf/AdGuardHome.yaml

@@ -1,53 +1,35 @@
-bind_host: 0.0.0.0
-bind_port: 3000
-beta_bind_port: 0
+http:
+  pprof:
+    port: 6060
+    enabled: false
+  address: 0.0.0.0:3000
+  session_ttl: 720h
 users:
   - name: Borgal
     password: $2a$10$HyZNzwrzK7z1cveWb6tONebiUL26A45LfwZB5lezB34nUy4PAcIKm
 auth_attempts: 5
 block_auth_min: 15
 http_proxy: ""
-language: ""
-debug_pprof: false
-web_session_ttl: 720
+language: de
+theme: auto
 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
-  blocking_ipv4: ""
-  blocking_ipv6: ""
-  blocked_response_ttl: 10
-  parental_block_host: family-block.dns.adguard.com
-  safebrowsing_block_host: standard-block.dns.adguard.com
   ratelimit: 0
+  ratelimit_subnet_len_ipv4: 24
+  ratelimit_subnet_len_ipv6: 56
   ratelimit_whitelist: []
   refuse_any: true
   upstream_dns:
-    - '##'
-    - '# Google'
-    - '##'
+    - '############# Google'
     - 1.1.1.1
     - 1.0.0.1
-    - '#https://dns.google/dns-query'
-    - '#tls://dns.google'
-    - '##'
-    - '# Cloudflare'
-    - '##'
+    - '############# Cloudflare'
     - 8.8.8.8
     - 8.8.4.4
-    - '#https://dns.cloudflare.com/dns-query'
-    - '#tls://1dot1dot1dot1.cloudflare-dns.com'
-    - '##'
-    - '# Lokal'
-    - '##'
+    - '############# Lokal'
     - '[/fritz.box/]192.168.0.1'
     - '[/168.192.in-addr.arpa/]192.168.0.1'
   upstream_dns_file: ""
@@ -56,8 +38,8 @@ dns:
     - 1.0.0.1
     - 8.8.8.8
     - 8.8.4.4
-  all_servers: false
-  fastest_addr: false
+  fallback_dns: []
+  upstream_mode: load_balance
   fastest_timeout: 1s
   allowed_clients: []
   disallowed_clients: []
@@ -75,28 +57,25 @@ 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: []
   ipset_file: ""
-  filtering_enabled: true
-  filters_update_interval: 1
-  parental_enabled: true
-  safesearch_enabled: false
-  safebrowsing_enabled: true
-  safebrowsing_cache_size: 1048576
-  safesearch_cache_size: 1048576
-  parental_cache_size: 1048576
-  cache_time: 30
-  rewrites: []
-  blocked_services: []
+  bootstrap_prefer_ipv6: false
   upstream_timeout: 10s
   private_networks: []
   use_private_ptr_resolvers: false
   local_ptr_upstreams: []
+  use_dns64: false
+  dns64_prefixes: []
   serve_http3: false
   use_http3_upstreams: false
+  serve_plain_dns: true
+  hostsfile_enabled: true
 tls:
   enabled: false
   server_name: ""
@@ -112,6 +91,18 @@ tls:
   certificate_path: ""
   private_key_path: ""
   strict_sni_check: false
+querylog:
+  dir_path: ""
+  ignored: []
+  interval: 24h
+  size_memory: 1000
+  enabled: true
+  file_enabled: true
+statistics:
+  dir_path: ""
+  ignored: []
+  interval: 24h
+  enabled: true
 filters:
   - enabled: true
     url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
@@ -157,7 +148,7 @@ filters:
     url: https://raw.githubusercontent.com/Spam404/lists/master/main-blacklist.txt
     name: Spam404
     id: 1656587031
-  - enabled: true
+  - enabled: false
     url: https://raw.githubusercontent.com/notracking/hosts-blocklists/master/adblock/adblock.txt
     name: Notracking blocklist
     id: 1656587033
@@ -194,7 +185,46 @@ 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'
+  - '@@||benefits.sovendus.com^$important'
+  - '@@||fhdi3gj7.r.us-east-1.awstrack.me^$important'
+  - '@@||t.notifications.groupe-pvcp.com^$important'
+  - '@@||metrics.brightcove.com^$important'
+  - '@@||notify-bugs-fra1.rtl.de^$important'
+  - '@@||ichnaea.netflix.com^$important'
+  - '@@||customerevents.netflix.com^$important'
+  - '@@||medumio96948.lt.acemlnb.com^$important'
+  - '@@||hamburg.de^$important'
+  - '@@||www.etracker.de^$important'
+  - '@@||hunkemoller.com^$important'
+  - '@@||as.bild.de^$important'
+  - '@@||click.cptrack.de^$important'
+  - '@@||lavieenrose.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 '
+  - '#'
+  - '||auth.macphun.com^$important'
+  - '||luminar3win.update.skylum.com^$important'
+  - '||luminar3.s3-accelerate.amazonaws.com^$important'
+  - '@@||api.segment.io^$important'
+  - '@@||googlevideo.com^$important'
+  - '@@||invite.journiapp.com^$important'
+  - '@@||googleads.g.doubleclick.net^$important'
+  - '@@||event-collector.prd.data.s.joyn.de^$important'
+  - '@@||vendor-list.consensu.org^$important'
   - ""
 dhcp:
   enabled: false
@@ -213,6 +243,36 @@ dhcp:
     lease_duration: 86400
     ra_slaac_only: false
     ra_allow_slaac: false
+filtering:
+  blocking_ipv4: ""
+  blocking_ipv6: ""
+  blocked_services:
+    schedule:
+      time_zone: Europe/Berlin
+    ids: []
+  protection_disabled_until: null
+  safe_search:
+    enabled: false
+    bing: true
+    duckduckgo: true
+    google: true
+    pixabay: true
+    yandex: true
+    youtube: true
+  blocking_mode: default
+  parental_block_host: family-block.dns.adguard.com
+  safebrowsing_block_host: standard-block.dns.adguard.com
+  rewrites: []
+  safebrowsing_cache_size: 1048576
+  safesearch_cache_size: 1048576
+  parental_cache_size: 1048576
+  cache_time: 30
+  filters_update_interval: 1
+  blocked_response_ttl: 10
+  filtering_enabled: true
+  parental_enabled: true
+  safebrowsing_enabled: true
+  protection_enabled: true
 clients:
   runtime_sources:
     whois: true
@@ -221,99 +281,286 @@ clients:
     dhcp: true
     hosts: true
   persistent:
-    - name: Buero-PC
-      tags: []
+    - safe_search:
+        enabled: false
+        bing: false
+        duckduckgo: false
+        google: false
+        pixabay: false
+        yandex: false
+        youtube: false
+      blocked_services:
+        schedule:
+          time_zone: Europe/Berlin
+        ids: []
+      name: Buero-PC
       ids:
         - 192.168.0.51
-      blocked_services: []
+      tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-71e0-9a76-f7f93da1e64d
+      upstreams_cache_size: 0
+      upstreams_cache_enabled: false
       use_global_settings: false
       filtering_enabled: true
       parental_enabled: false
-      safesearch_enabled: false
       safebrowsing_enabled: true
       use_global_blocked_services: true
-    - name: FireTV-WZ
-      tags: []
+      ignore_querylog: false
+      ignore_statistics: false
+    - safe_search:
+        enabled: false
+        bing: false
+        duckduckgo: false
+        google: false
+        pixabay: false
+        yandex: false
+        youtube: false
+      blocked_services:
+        schedule:
+          time_zone: Europe/Berlin
+        ids: []
+      name: FireTV-WZ
       ids:
-        - 192.168.0.34
-      blocked_services: []
+        - 192.168.0.56
+      tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-7d6c-a1d4-2f005d7c17ab
+      upstreams_cache_size: 0
+      upstreams_cache_enabled: false
       use_global_settings: true
       filtering_enabled: false
       parental_enabled: false
-      safesearch_enabled: false
       safebrowsing_enabled: false
       use_global_blocked_services: true
-    - name: Fritz.Box
-      tags: []
+      ignore_querylog: false
+      ignore_statistics: false
+    - safe_search:
+        enabled: false
+        bing: false
+        duckduckgo: false
+        google: false
+        pixabay: false
+        yandex: false
+        youtube: false
+      blocked_services:
+        schedule:
+          time_zone: Europe/Berlin
+        ids: []
+      name: Fritz.Box
       ids:
         - 192.168.0.1
-      blocked_services: []
+      tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-7f8d-95fe-fcfe6d363a29
+      upstreams_cache_size: 0
+      upstreams_cache_enabled: false
       use_global_settings: false
       filtering_enabled: true
       parental_enabled: false
-      safesearch_enabled: false
       safebrowsing_enabled: true
       use_global_blocked_services: true
-    - name: Galaxy Tab-A7
-      tags: []
+      ignore_querylog: false
+      ignore_statistics: false
+    - safe_search:
+        enabled: false
+        bing: false
+        duckduckgo: false
+        google: false
+        pixabay: false
+        yandex: false
+        youtube: false
+      blocked_services:
+        schedule:
+          time_zone: Europe/Berlin
+        ids: []
+      name: Galaxy Tab-A7
       ids:
         - 192.168.0.59
-      blocked_services: []
+      tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-7739-bbc2-bf9b979f9913
+      upstreams_cache_size: 0
+      upstreams_cache_enabled: false
       use_global_settings: false
       filtering_enabled: true
       parental_enabled: false
-      safesearch_enabled: false
       safebrowsing_enabled: true
       use_global_blocked_services: true
-    - name: ROG
-      tags: []
+      ignore_querylog: false
+      ignore_statistics: false
+    - safe_search:
+        enabled: false
+        bing: false
+        duckduckgo: false
+        google: false
+        pixabay: false
+        yandex: false
+        youtube: false
+      blocked_services:
+        schedule:
+          time_zone: Europe/Berlin
+        ids: []
+      name: ROG
       ids:
-        - 192.168.0.66
-      blocked_services: []
+        - 192.168.0.98
+      tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-741f-9824-85cdb1315521
+      upstreams_cache_size: 0
+      upstreams_cache_enabled: false
       use_global_settings: false
       filtering_enabled: true
       parental_enabled: false
-      safesearch_enabled: false
       safebrowsing_enabled: true
       use_global_blocked_services: true
-    - name: S10-Lars
+      ignore_querylog: false
+      ignore_statistics: false
+    - safe_search:
+        enabled: false
+        bing: true
+        duckduckgo: true
+        google: true
+        pixabay: true
+        yandex: true
+        youtube: true
+      blocked_services:
+        schedule:
+          time_zone: Europe/Berlin
+        ids: []
+      name: ROG-980
+      ids:
+        - 192.168.0.58
       tags: []
+      upstreams: []
+      uid: 018d7fa4-2a1d-70b1-8f0b-e7be87a33423
+      upstreams_cache_size: 0
+      upstreams_cache_enabled: false
+      use_global_settings: false
+      filtering_enabled: true
+      parental_enabled: false
+      safebrowsing_enabled: true
+      use_global_blocked_services: true
+      ignore_querylog: false
+      ignore_statistics: false
+    - safe_search:
+        enabled: false
+        bing: false
+        duckduckgo: false
+        google: false
+        pixabay: false
+        yandex: false
+        youtube: false
+      blocked_services:
+        schedule:
+          time_zone: Europe/Berlin
+        ids: []
+      name: S10-Lars
       ids:
         - 192.168.0.42
-      blocked_services: []
+      tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-7e3c-a8e5-2d70f8580abb
+      upstreams_cache_size: 0
+      upstreams_cache_enabled: false
       use_global_settings: false
       filtering_enabled: true
       parental_enabled: false
-      safesearch_enabled: false
       safebrowsing_enabled: true
       use_global_blocked_services: true
-    - name: Sandra-P30
+      ignore_querylog: false
+      ignore_statistics: false
+    - safe_search:
+        enabled: false
+        bing: true
+        duckduckgo: true
+        google: true
+        pixabay: true
+        yandex: true
+        youtube: true
+      blocked_services:
+        schedule:
+          time_zone: Europe/Berlin
+        ids: []
+      name: S20+ Lars
+      ids:
+        - 192.168.0.60
       tags: []
+      upstreams: []
+      uid: 018d7fa4-2a1d-7acf-aa55-c000293947bc
+      upstreams_cache_size: 0
+      upstreams_cache_enabled: false
+      use_global_settings: false
+      filtering_enabled: true
+      parental_enabled: false
+      safebrowsing_enabled: true
+      use_global_blocked_services: true
+      ignore_querylog: false
+      ignore_statistics: false
+    - safe_search:
+        enabled: false
+        bing: true
+        duckduckgo: true
+        google: true
+        pixabay: true
+        yandex: true
+        youtube: true
+      blocked_services:
+        schedule:
+          time_zone: Europe/Berlin
+        ids: []
+      name: S7-Lars
+      ids:
+        - 192.168.0.62
+      tags: []
+      upstreams: []
+      uid: 018d7fa4-2a1d-7fb5-a762-4f4599510a9d
+      upstreams_cache_size: 0
+      upstreams_cache_enabled: false
+      use_global_settings: false
+      filtering_enabled: true
+      parental_enabled: false
+      safebrowsing_enabled: true
+      use_global_blocked_services: true
+      ignore_querylog: false
+      ignore_statistics: false
+    - safe_search:
+        enabled: false
+        bing: false
+        duckduckgo: false
+        google: false
+        pixabay: false
+        yandex: false
+        youtube: false
+      blocked_services:
+        schedule:
+          time_zone: Europe/Berlin
+        ids: []
+      name: Sandra-P30
       ids:
         - 192.168.0.46
-      blocked_services: []
+      tags: []
       upstreams: []
+      uid: 018d7fa4-2a1d-729a-a02b-bb7bd6c6340f
+      upstreams_cache_size: 0
+      upstreams_cache_enabled: false
       use_global_settings: true
       filtering_enabled: false
       parental_enabled: false
-      safesearch_enabled: false
       safebrowsing_enabled: false
       use_global_blocked_services: true
-log_file: ""
-log_max_backups: 0
-log_max_size: 100
-log_max_age: 3
-log_compress: false
-log_localtime: false
-verbose: false
+      ignore_querylog: false
+      ignore_statistics: false
+log:
+  file: ""
+  max_backups: 0
+  max_size: 100
+  max_age: 3
+  compress: false
+  local_time: false
+  verbose: false
 os:
   group: ""
   user: ""
   rlimit_nofile: 0
-schema_version: 14
+schema_version: 28

adguard/docker-compose.yml

@@ -1,19 +1,18 @@
-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:
-#      - 192.168.0.111:53:53/tcp
-#      - 192.168.0.111:53:53/udp
       - 53:53/tcp
       - 53:53/udp
       - 3000:3000/tcp
-      - 3080:80/tcp
     environment:
       - TZ=Europe/Berlin
-    restart: unless-stopped
+    restart: unless-stopped

adguard/readme.md

@@ -1,5 +1,51 @@
-## AdGuard
-
-![](https://res.cloudinary.com/canonical/image/fetch/f_auto,q_auto,fl_sanitize,c_fill,w_720/https://ubuntu.com/wp-content/uploads/10b2/adguard-compressor.png)
-
-AdGuard Home ist eine netzwerkweite Software zum Sperren von Werbung und Tracking. Nachdem Sie es eingerichtet haben, deckt es ALLE Ihre Heimgeräte ab, und Sie brauchen dafür keine clientseitige Software. Mit dem Aufstieg von „Internet der Dinge” und vernetzten Geräten wird es immer wichtiger, Ihr gesamtes Netzwerk zu kontrollieren.
+<h2>AdGuard</H2>
+<p></p>
+<p></p>
+<img src="https://ubuntu.com/wp-content/uploads/10b2/adguard-compressor.png" alt="Adguard" width="200" />
+<p></p>
+<p></p>
+<p><b>AdGuard Home</b> ist eine netzwerkweite Software zum Sperren von Werbung und Tracking. Nachdem Sie es eingerichtet haben, deckt es ALLE Ihre Heimgeräte ab, und Sie brauchen dafür keine clientseitige Software. Mit dem Aufstieg von „Internet der Dinge” und vernetzten Geräten wird es immer wichtiger, Ihr gesamtes Netzwerk zu kontrollieren.
+</p>
+<p></p>
+<a href="https://adguard.com/de/adguard-home/overview.html/" target="_blank">Adguard Home</a>
+<p></p>
+<h3>HowTo</h3>
+<hr>
+<p></p>
+<p>Upstream DNS Server</p>
+<pre>[/fritz.box/]192.168.0.1
+[/168.192.in-addr.arpa/]192.168.0.1</code></pre>
+<p></p>
+<p></p>
+<h4>Port 53 Anpassung</h4>
+<p></p>
+<pre>systemctl stop systemd-resolved
+systemctl disable systemd-resolved</pre>
+<p></p>
+<pre>nano /etc/resolv.conf</pre>
+<p></p>
+<pre># This is /run/systemd/resolve/stub-resolv.conf managed by man:systemd-resolved(8).
+# Do not edit.
+#
+# This file might be symlinked as /etc/resolv.conf. If you're looking at
+# /etc/resolv.conf and seeing this text, you have followed the symlink.
+#
+# This is a dynamic resolv.conf file for connecting local clients to the
+# internal DNS stub resolver of systemd-resolved. This file lists all
+# configured search domains.
+#
+# Run "resolvectl status" to see details about the uplink DNS servers
+# currently in use.
+#
+# Third party programs should typically not access this file directly, but only
+# through the symlink at /etc/resolv.conf. To manage man:resolv.conf(5) in a
+# different way, replace this symlink by a static file or a different symlink.
+#
+# See man:systemd-resolved.service(8) for details about the supported modes of
+# operation for /etc/resolv.conf.
+#
+# nameserver 127.0.0.53  entfert für Port 53 von AdGuard Home
+#
+nameserver 127.0.0.1
+options edns0 trust-ad
+search .</pre>

bitwarden/.env.sample

@@ -0,0 +1,8 @@
+# Admin-Token für die Anmeldung der Admin-Page
+# Anmeldung über https: bitwarden.MyDomain.de/admin
+# Hier ist das Passwort anzugeben, womit der Token erzeugt wurde
+# Den Token kann man z.B. über docker exec -it bitwarden ./vaultwarden hash erzeugen
+# WICHTIG - Wird die Admin Page nicht benötigt, dann sollte man die Zeile ADMIN_TOKEN in der docker-compose Datei mit einem # auskommentieren
+
+
+ADMIN_TOKEN='ChangeMe'

bitwarden/docker-compose.yml

@@ -1,10 +1,12 @@
-version: "2"
 services:
   bitwarden:
-    image: vaultwarden/server:latest
+    image: vaultwarden/server:latest-alpine
     container_name: bitwarden
+    environment:
+      - TZ=Europe/Berlin
+      # - ADMIN_TOKEN=${ADMIN_TOKEN}  # Wird die Admin-Page nicht gebraucht, bitte auskommentieren
     volumes:
       - /opt/bitwarden/bwdata/:/data/
     ports:
       - 8084:80
-    restart: always
+    restart: always

bitwarden/readme.md

@@ -1,11 +1,16 @@
-## Bitwarden
-
-![](https://i.pcmag.com/imagery/reviews/05JPSXpKxx9c5oL8wwZMAkX-27..1622837895.png)
-
-Bitwarden ist der einfachste und sicherste Weg all deine Logins und Passwörter zu speichern, während du sie zwischen all deinen Geräten synchronisierst.
+<h2>Bitwarden/Vaultwarden</H2>
+<p></p>
+<p></p>
+<img src="https://i.pcmag.com/imagery/reviews/05JPSXpKxx9c5oL8wwZMAkX-27..1622837895.png" alt="Bitwarden" width="200" />
+<p></p>
+<p></p>
+<b>Bitwarden/Vaultwarden</b> ist der einfachste und sicherste Weg all deine Logins und Passwörter zu speichern, während du sie zwischen all deinen Geräten synchronisierst.
 
 Passwort-Diebstahl ist ein echtes Problem. Die Webseiten und Apps, welche du verwendest, werden jeden Tag angegriffen und oftmals werden deine Passwörter dabei gestohlen. Wenn das gleiche Passwort bei mehreren Apps und Websites verwendet wird, können Hacker sich damit ganz einfach auch in deine E-Mails oder deinen Bank-Account einloggen.
 
 Sicherheitsexperten empfehlen daher, dass du für jeden Account, den du erstellst, ein anderes, zufällig generiertes Passwort verwendest. Aber wie sollst du dir all diese Passwörter merken? bitwarden hilft dir dabei, deine Passwörter zu erstellen, speichern und zu verwalten.
 
-Bitwarden speichert all deine Logins in einem verschlüsselten Tresor, der mit allen Geräten synchronisiert wird. Da er komplett verschlüsselt ist, bevor er überhaupt dein Gerät verlässt, hast nur du Zugriff auf deine Daten. Nicht einmal Bitwarden kann deine Daten lesen, selbst, wenn wir es wollten. Deine Daten sind mit einer AES-256-Bit-Verschlüsselung, sowie Salted Hashing und PBKDR2 SHA-256 abgesichert.
+Bitwarden speichert all deine Logins in einem verschlüsselten Tresor, der mit allen Geräten synchronisiert wird. Da er komplett verschlüsselt ist, bevor er überhaupt dein Gerät verlässt, hast nur du Zugriff auf deine Daten. Nicht einmal Bitwarden kann deine Daten lesen, selbst, wenn wir es wollten. Deine Daten sind mit einer AES-256-Bit-Verschlüsselung, sowie Salted Hashing und PBKDR2 SHA-256 abgesichert.
+<p></p>
+<a href="https://hub.docker.com/r/vaultwarden/server/" target="_blank">Vaultwarden</a>
+<p></p>

bookstack/README.md

@@ -1 +1,10 @@
-Beschreibung
+<h2>Bookstack</H2>
+<p></p>
+<p></p>
+<img src="https://project.borgal.de/images/logo/bookstack.png" alt="Bookstack" width="200" />
+<p></p>
+<p></p>
+<b>Bookstack</b> ist eine benutzerfreundliche und flexible Plattform für das Content-Management. Mit seiner intuitiven Oberfläche können Benutzer leicht Texte, Bilder, Dateien und Code-Blöcke erstellen und organisieren.
+<p></p>
+<a href="https://www.bookstackapp.com/" target="_blank">Bookstack</a>
+<p></p>

bookstack/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3"
 services:
   bookstack:
     image: ghcr.io/linuxserver/bookstack
@@ -6,6 +5,7 @@ services:
     environment:
       - APP_URL=https://${DOMAIN}
       - NGINX_ENABLE_FASTCGI_HTTPS=True
+      - TZ=Europe/Berlin
       - DB_HOST=bookstack_db
       - DB_USER=${DB_USER}
       - DB_PASS=${DB_PASS}
@@ -28,8 +28,6 @@ services:
       - MYSQL_DATABASE=bookstackapp
       - MYSQL_USER=${DB_USER}
       - MYSQL_PASSWORD=${DB_PASS}
-    ports:
-      - 3306:3306
     volumes:
       - /opt/bookstack:/config
-    restart: unless-stopped
+    restart: unless-stopped

cloud/.env.sample

@@ -1,8 +0,0 @@
-MYSQL_PASSWORD=changeMe
-MYSQL_DATABASE=nextcloud
-MYSQL_USER=nextcloud
-
-MYSQL_ROOT_PASSWORD=changeMe
-
-NFS_SERVER=192.168.0.xxx 	# oder hostname oder Domain
-PFAD=/Pfad/zum/Ordner

cloud/docker-compose.yml

@@ -1,58 +0,0 @@
-version: "3"
-services:
-
-  cloud_db:
-    image: ghcr.io/linuxserver/mariadb
-    container_name: cloud_db
-    restart: always
-    volumes:
-      - ./database:/config
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Berlin
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
-      - MYSQL_PASSWORD=${MYSQL_PASSWORD}
-      - MYSQL_DATABASE=${MYSQL_DATABASE}
-      - MYSQL_USER=${MYSQL_USER}
-    labels:
-      - "com.centurylinklabs.watchtower.enable=false"
-
-
-  cloud_redis:
-    image: redis:alpine
-    volumes:
-      - ./redis:/data
-    container_name: cloud_redis
-    restart: always
-
-  cloud:
-    image: ghcr.io/linuxserver/nextcloud
-    container_name: cloud
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Berlin
-      - MYSQL_HOST=cloud_db
-      - REDIS_HOST=cloud_redis
-    depends_on:
-      - cloud_db
-      - cloud_redis
-    volumes:
-      - ./config:/config
-      - cloud:/data
-    ports:
-      - 8100:443
-    labels:
-      - "com.centurylinklabs.watchtower.enable=false"
-
-    restart: unless-stopped
-
-volumes:
-  cloud:
-    name: cloud
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=${NFS_SERVER},rw
-      device: ":${PFAD}"

code-server/README.md

@@ -0,0 +1,23 @@
+<h2>Code-Server</H2>
+<p></p>
+<p></p>
+<img src="https://project.borgal.de/images/logo/code-server.png" alt="Code-Server" width="200" />
+<p></p>
+<p></p>
+<b>Code-Server</b> Visual Studio Code fungiert als portable Entwicklungsumgebung, um die Qualitätssicherung, Downloads und vieles mehr zu beschleunigen. Die optionale IntelliSense-Funktion führt wortbasierte Vervollständigungen für viele Programmiersprachen out-of-the-box durch, und noch mehr sind als Erweiterungen verfügbar. Verwenden Sie eine Reihe flexibler Erweiterungen, um neue Sprachen hinzuzufügen und eine Verbindung zu den Diensten herzustellen, die Sie bereits verwenden.
+<p></p>
+<a href="https://github.com/coder/code-server/" target="_blank">Code-Server</a>
+<p></p>
+<h3>HowTo</h3>
+<hr>
+<p></p>
+<h3>Code-Server</h3>
+<p>F&uuml;r den Code-Server muss im Nginx Proxy-Manager der Haken bei "Websockets Support" aktiviert werden</p>
+<p></p>
+<p><a href="https://www.digitalocean.com/community/tutorials/how-to-set-up-visual-studio-code-for-php-projects" target="_blank">PHP Umgebung installieren</a></p>
+<p><a href="https://marketplace.visualstudio.com/" target="_blank">VS-Code Erweiterungen</a></p>
+<p></p>
+<p>Ihre Benutzereinstellungen befinden sich in /opt/code-server/config/data/User</p>
+<p>Sie k&ouml;nnen einfach die Dateien keybindings.json und settings.json in den entsprechenden Ordner auf Ihrem neuen Computer kopieren.</p>
+<p>Ihre Erweiterungen befinden sich in /opt/code-server/config/extensions.<br>Die meisten Erweiterungen verwenden keine nativen Bindungen und sollten beim Kopieren ordnungsgem&auml;&szlig; funktionieren.<br>Sie k&ouml;nnen diejenigen, die dies nicht tun, manuell neu installieren.</p>
+<p></p>

code-server/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   code-server:
     image: ghcr.io/linuxserver/code-server
@@ -19,8 +17,8 @@ services:
       - www:/www
     ports:
       - 8181:8443
-      - 8184:5500
-      - 5555:5555
+#      - 8184:5500
+#      - 5555:5555
     restart: unless-stopped
 
 volumes:
@@ -28,6 +26,6 @@ volumes:
     name: www
     driver: local
     driver_opts:
-      type: nfs
+      type: nfs4
       o: addr=${NFS_SERVER},rw
       device: ":${PFAD}"

dozzle/README.md

@@ -0,0 +1,10 @@
+<h2>DOZZLE</H2>
+<p></p>
+<p></p>
+<img src="https://developer.asustor.com/uploadIcons/0020_117518_1660879946_dozzle_256.png" alt="dozzle" width="200"/>
+<p></p>
+<p></p>
+<b>Dozzle</b> ist ein Realtime Docker Container Monitor für Logging.
+<p></p>
+<a href="https://dozzle.dev/" target="_blank">Dozzle</a>
+<p></p>

dozzle/docker-compose.yml

@@ -0,0 +1,9 @@
+services:
+  dozzle:
+    container_name: dozzle
+    image: amir20/dozzle:latest
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    ports:
+      - 9999:8080
+    restart: unless-stopped

drawio/README.md

@@ -0,0 +1,10 @@
+<h2>Draw.io</H2>
+<p></p>
+<p></p>
+<img style="display: block; margin-left: auto; margin-right: auto;" src="https://cdn.worldvectorlogo.com/logos/draw-io.svg" alt="draw.io" width="200"/>
+<p></p>
+<p></p>
+<b>Draw.io</b> ist ein Online-Diagrammsoftware zum Erstellen von Flussdiagrammen, Prozessdiagrammen und Organigrammen.
+<p></p>
+<a href="https://draw.io/" target="_blank">Draw.io</a>
+<p></p>

drawio/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.5'
 services:
   drawio:
     image: jgraph/drawio
@@ -6,4 +5,3 @@ services:
     restart: unless-stopped
     ports:
       - 8085:8080
-      - 8445:8443

duplicati/.env.sample

@@ -1,2 +1,3 @@
+PASS=ChangeMe
 NFS_SERVER=192.168.0.xxx 	# oder hostname oder Domain
 PFAD=/Pfad/zum/Ordner

duplicati/README.md

@@ -0,0 +1,10 @@
+<h2>Duplicati</H2>
+<p></p>
+<p></p>
+<img src="https://avatars.githubusercontent.com/u/8270231?s=280&v=4" alt="Duplicati" width="200" />
+<p></p>
+<p></p>
+<b>Duplicati</b> ist eine Software, die verschlüsselte, komprimierte, inkrementelle Datensicherungen erstellt und diese auf Netzwerklaufwerke, integrierte oder externe USB-Festplatten oder Onlinespeicher überträgt.
+<p></p>
+<a href="https://duplicati.com/" target="_blank">Duplicati</a>
+<p></p>

duplicati/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "2.1"
 services:
   duplicati:
     image: ghcr.io/linuxserver/duplicati
@@ -7,10 +6,11 @@ services:
       - PUID=0
       - PGID=0
       - TZ=Europe/Berlin
-      - CLI_ARGS= #optional
+      - DUPLICATI__WEBSERVICE_PASSWORD=${PASS}
     volumes:
       - ./config:/config
       - backup:/backups
+      - Immich:/mnt/immich
       - /opt:/source
       - ./shared:/shared
       - /var/run/docker.sock:/var/run/docker.sock
@@ -24,6 +24,14 @@ volumes:
     name: backup
     driver: local
     driver_opts:
-      type: nfs
+      type: nfs4
       o: addr=${NFS_SERVER},rw
       device: ":${PFAD}"
+
+  Immich:
+    name: Immich
+    driver: local
+    driver_opts:
+      type: nfs4
+      o: addr=${NFS_SERVER},rw
+      device: ":${PFAD2}"

filerun/.env.sample

@@ -1,8 +0,0 @@
-#MySQL Datenbank
-MYSQL_USER=changeMe
-MYSQL_PASSWORD=changeMe
-MYSQL_ROOT_PASSWORD=changeMe
-
-NFS_SERVER=192.168.0.xxx 	# oder hostname oder Domain
-PFAD_1=/Pfad/zum/Ordner/www
-PFAD_2=/Pfad/zum/Ordner/energie

filerun/docker-compose.yml

@@ -1,45 +0,0 @@
-version: '2'
-
-services:
-
-  db:
-    image: mariadb:10.1
-    container_name: filerun_db
-    environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_USER: ${MYSQL_USER} 
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
-      MYSQL_DATABASE: filerun
-    restart: unless-stopped
-    volumes: 
-      - ./db:/var/lib/mysql
-
-  filerun:
-    image: filerun/filerun
-    container_name: filerun_app
-    environment:
-      FR_DB_HOST: db
-      FR_DB_PORT: 3306
-      FR_DB_NAME: filerun
-      FR_DB_USER: ${MYSQL_USER}
-      FR_DB_PASS: ${MYSQL_PASSWORD}
-    depends_on:
-      - db
-    links:
-      - db:db
-    ports:
-      - "8013:80"
-    restart: unless-stopped
-    volumes:
-      - ./html:/var/www/html
-      - ./user-files:/user-files
-      - Dokumente:/user-files/Dokumente
-
-volumes:
-  Dokumente:
-    name: Dokumente
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=${NFS_SERVER},rw
-      device: ":${PFAD_Dokumente}"

fredbet/docker-compose.yml

@@ -1,37 +0,0 @@
-version: "3"
-services:
-    mariadb:  
-      image: mariadb:10.1.11
-      container_name: fredbet_db
-      volumes:
-        - /opt/fredbet/mariadb:/var/lib/mysql
-      ports:
-        - "3307:3306"
-      environment:
-       - MYSQL_DATABASE=fredbetdb
-       - MYSQL_ROOT_PASSWORD=secred
-       - MYSQL_USER=fred
-       - MYSQL_PASSWORD=fred
-      restart: unless-stopped
-
-    fredbet:
-      image: fred4jupiter/fredbet
-      container_name: fredbet
-      links:
-        - mariadb:mariadb
-      depends_on:
-        - mariadb
-      ports:
-        - "8083:8080"
-      environment:
-       - SPRING_PROFILES_ACTIVE=prod
-       - SPRING_DATASOURCE_URL=jdbc:mariadb://mariadb:3306/fredbetdb
-       - SPRING_DATASOURCE_USERNAME=fred
-       - SPRING_DATASOURCE_PASSWORD=fred
-       - SPRING_DATASOURCE_DRIVER_CLASS_NAME=org.mariadb.jdbc.Driver
-       - FREDBET_IMAGE_LOCATION_FILE=FILE_SYSTEM
-       - FREDBET_IMAGE_FILE_SYSTEM_BASE_FOLDER=/home/fred/fredbet_images
-      volumes:
-       - "./fredbet_images:/home/fred/fredbet_images"
-       - "./tmp:/tmp"
-      restart: unless-stopped

gitea/README.md

@@ -0,0 +1,10 @@
+<h2>Gitea</H2>
+<p></p>
+<p></p>
+<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/b/bb/Gitea_Logo.svg/2560px-Gitea_Logo.svg.png" alt="Gitea" width="200" />
+<p></p>
+<p></p>
+<b>Gitea</b> Gitea ist eine freie, in Go entwickelte Softwarelösung, die eine gehostete Softwareentwicklungsplattform bereitstellt. Diese unterstützt neben der Versionsverwaltung über Git auch kollaborative Werkzeuge, wie Bugtracker, Wiki und Code-Review. Die Benutzeroberfläche orientiert sich an GitHub.
+<p></p>
+<a href="https://about.gitea.com/" target="_blank">Gitea</a>
+<p></p>

gitea/docker-compose.yml

@@ -1,13 +1,11 @@
-version: "3"
-
 services:
   gitea:
-    image: gitea/gitea:latest
+    image: gitea/gitea
     container_name: gitea
     environment:
       - USER_UID=1000
       - USER_GID=1000
-    restart: always
+    restart: unless-stopped
     volumes:
       - ./gitea:/data
       - /etc/timezone:/etc/timezone:ro

gotify/README.md

@@ -0,0 +1,12 @@
+<h2>Gotify</H2>
+<p></p>
+<p></p>
+<img src="https://avatars.githubusercontent.com/u/36410427?s=200&v=4" alt="Gotify" width="200" />
+<p></p>
+<p></p>
+<b>Gotify</b> ist ein simpler Server zum Senden (via REST-API) und Empfangen (via Websocket) von Nachrichten.
+<p></p>
+<a href="https://gotify.net/" target="_blank">Gotify</a>
+<p></p>
+
+

gotify/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "2"
 services:
   gotify:
     container_name: gotify
@@ -9,4 +8,4 @@ services:
       - ./data:/app/data
     environment:
       - TZ=Europe/Berlin
-    restart: unless-stopped
+    restart: unless-stopped

grafana/.env.sample

@@ -0,0 +1,5 @@
+GRAFANA_USERNAME=ChangeMe
+GRAFANA_PASSWORD=ChangeMe
+
+INFLUXDB_USERNAME=ChangeMe
+INFLUXDB_PASSWORD=ChangeMe

grafana/README.md

@@ -0,0 +1,10 @@
+<h2>Grafana</H2>
+<p></p>
+<p></p>
+<img src="https://cdn.icon-icons.com/icons2/2699/PNG/512/grafana_logo_icon_171049.png" alt="Grafana" width="200" />
+<p></p>
+<p></p>
+<b>Grafana</b> ist eine plattformübergreifende Open-Source-Anwendung zur grafischen Darstellung von Daten aus verschiedenen Datenquellen wie z. B. InfluxDB, MySQL, PostgreSQL, Prometheus und Graphite. Die erfassten Rohdaten lassen sich anschließend in verschiedenen Anzeigeformen ausgeben.
+<p></p>
+<a href="https://grafana.com/" target="_blank">Grafana</a>
+<p></p>

grafana/docker-compose.yml

@@ -0,0 +1,47 @@
+services:
+  influxdb:
+    #image: influxdb
+    image: influxdb:1.6.4
+    container_name: influxdb
+    ports:
+      - 8096:8086
+    volumes:
+      - ./influxdb:/var/lib/influxdb
+    environment:
+      - INFLUXDB_DB=METRICS
+      - INFLUXDB_USERNAME=${INFLUXDB_USERNAME}
+      - INFLUXDB_PASSWORD=${INFLUXDB_PASSWORD}
+      - INFLUXDB_REPORTING_DISABLED=true
+        #Determines which level of logs will be emitted. The available levels are error, warn, info, and debug.
+      - INFLUXDB_LOGGING_LEVEL=warn
+    restart: unless-stopped
+
+  chronograf:
+    image: chronograf:1.6
+    container_name: chronograf
+    volumes:
+      - ./chronograf_data:/var/lib/chronograf
+    ports:
+      - 8088:8888
+    depends_on:
+      - influxdb
+    environment:
+      - INFLUXDB_URL=http://influxdb:8086
+      - INFLUXDB_USERNAME=${INFLUXDB_USERNAME}
+      - INFLUXDB_PASSWORD=${INFLUXDB_PASSWORD}
+    restart: always
+
+  grafana:
+    image: grafana/grafana:latest
+    container_name: grafana
+    ports:
+      - 3090:3000
+    volumes:
+      - ./grafana-storage:/var/lib/grafana
+      - ./grafana-provisioning/:/etc/grafana/provisioning
+    depends_on:
+      - influxdb
+    environment:
+      - GF_SECURITY_ADMIN_USER=${GRAFANA_USERNAME}
+      - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_PASSWORD}
+    restart: unless-stopped

grocy/README.md

@@ -0,0 +1,10 @@
+<h2>Grocy</H2>
+<p></p>
+<p></p>
+<img src="https://upload.wikimedia.org/wikipedia/commons/4/45/Grocy_logo.svg" alt="Grocy" width="200" />
+<p></p>
+<p></p>
+<b>Grocy</b> ist eine selbst gehostete Webanwendung zur Lebensmittel- und Haushaltsverwaltung.
+<p></p>
+<a href="https://grocy.info/de/" target="_blank">Grocy</a>
+<p></p>

grocy/docker-compose.yml

@@ -1,5 +1,3 @@
----
-version: "2.1"
 services:
   grocy:
     image: lscr.io/linuxserver/grocy
@@ -12,4 +10,4 @@ services:
       - ./config:/config
     ports:
       - 8011:80
-    restart: unless-stopped
+    restart: unless-stopped

heimdall/README.md

@@ -0,0 +1,10 @@
+<h2>Heimdall</H2>
+<p></p>
+<p></p>
+<img src="https://spin.atomicobject.com/wp-content/uploads/heimdall-icon-large2.png" alt="Heimdall" width="200" />
+<p></p>
+<p></p>
+<b>Heimdall</b> ist ein Dashboard für alle Ihre Webanwendungen. Es muss jedoch nicht auf Anwendungen beschränkt sein, Sie können Links zu allem hinzufügen, was Sie möchten.
+<p></p>
+<a href="https://heimdall.site/" target="_blank">Heimdall</a>
+<p></p>

heimdall/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "3"
 services:
   heimdall:
     image: ghcr.io/linuxserver/heimdall
@@ -11,5 +10,4 @@ services:
       - /opt/heimdall/data:/config
     ports:
       - 8124:80
-      - 8143:443
-    restart: unless-stopped
+    restart: unless-stopped

homeassistant/README.md

@@ -0,0 +1,11 @@
+<h2>Home Assistant</H2>
+<p></p>
+<p></p>
+<img src="https://www.it-und-hausautomation-blog.de/wp-content/uploads/2022/12/1200px-Home_Assistant_Logo.svg.png" alt="Home Assistant" width="200" />
+<p></p>
+<p></p>
+<p><b>Home Assistant</b> Home Assistant ist eine kostenlose und quelloffene Software zur Hausautomation, die als zentrales Steuerungssystem in einem Smart Home oder Smart House konzipiert ist. Geschrieben in Python liegt ihr Hauptaugenmerk auf lokaler Steuerung und Privatsphäre.
+</p>
+<p></p>
+<a href="https://www.home-assistant.io/" target="_blank">Home Assistant</a>
+<p></p>

homeassistant/config/automations.yaml

@@ -0,0 +1,16 @@
+- id: '1734541261890'
+  alias: Batteriewarnung X5
+  description: ''
+  triggers:
+  - trigger: numeric_state
+    entity_id:
+    - sensor.max_watch_battery_max
+    below: 29.9
+  conditions: []
+  actions:
+  - action: notify.mobile_app_s20_lars
+    metadata: {}
+    data:
+      message: Batterie X5 unter 30%
+      title: Warnung
+  mode: single

homeassistant/config/configuration.yaml

@@ -0,0 +1,37 @@
+# Configure a default setup of Home Assistant (frontend, api, etc)
+default_config:
+
+# Text to speech
+tts:
+  - platform: google_translate
+
+group: !include groups.yaml
+automation: !include automations.yaml
+script: !include scripts.yaml
+scene: !include scenes.yaml
+
+# Localhost als erlaubter zugang zulassen
+
+homeassistant:
+  external_url: "https://ha.borgal.de"
+  internal_url: "https://docker:8123"
+
+  customize:
+    sensor.bitshake_smartmeterreader_aktuelle_wirkleistung:
+      unit_of_measurement: "W"
+      device_class: energy
+
+    sensor.bitshake_smartmeterreader_total_in:
+      unit_of_measurement: "kWh"
+      device_class: energy
+
+    sensor.bitshake_smartmeterreader_total_out:
+      unit_of_measurement: "kWh"
+      device_class: energy
+
+http:
+  use_x_forwarded_for: true
+  trusted_proxies:
+    #- 0.0.0.0
+    - 192.168.0.111 # IP Docker
+    - 10.1.0.0/16 # IP Range Docker Container

homeassistant/docker-compose.yml

@@ -1,17 +1,21 @@
-version: '3'
 services:
   homeassistant:
     container_name: homeassistant
-    restart: always
     image: homeassistant/home-assistant
     volumes:
       - /opt/homeassistant/config:/config
       - /etc/localtime:/etc/localtime:ro
       - /dev/serial/by-id:/dev/serial/by-id
     devices:
-      - /dev/ttyACM0:/dev/ttyACM0
+     # - /dev/ttyACM0:/dev/ttyACM0
+      - /dev/ttyUSB0:/dev/ttyUSB0
     ports:
-      - "192.168.0.111:8123:8123"
+      - 8123:8123
     privileged: true
     environment:
-      - TZ=Europe/Berlin
+      - TZ=Europe/Berlin
+    labels:
+      - com.centurylinklabs.watchtower.enable=true
+
+    restart: unless-stopped
+    network_mode: host

hp-scan/README.md

@@ -0,0 +1,12 @@
+<h2>HP-Scan-to</H2>
+<p></p>
+<p></p>
+<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/a/ad/HP_logo_2012.svg/2048px-HP_logo_2012.svg.png" alt="HP-Scan-to" width="200" />
+<p></p>
+<p></p>
+<p><b>HP-Scan-to</b> ist eine Node.js-Anwendung, die die Funktionalität des „Scan to Computer“ von HP nachbildet. Zu diesem Zweck wurde die Interaktion der ursprünglichen HP Windows-Anwendung mit dem Gerät zurückentwickelt. Sein Hauptzweck besteht darin, Benutzern das Scannen von Dokumenten direkt von einem HP-Gerät und die nahtlose Übertragung auf einen Computer zu ermöglichen. Im Gegensatz zum Originalprogramm ist dieses Programm so konzipiert, dass es mit Linux (einschließlich Docker) kompatibel ist.
+
+</p>
+<p></p>
+<a href="https://github.com/manuc66/node-hp-scan-to" target="_blank">HP-Scan-to</a>
+<p></p>

hp-scan/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   hp-scan:
     image: manuc66/node-hp-scan-to:latest
@@ -7,8 +5,9 @@ services:
     hostname: TrueNAS
     environment:
       - IP=192.168.0.11
+      - Label=TrueNas-Scan
       - PATTERN="scan"_dd.mm.yyyy_hh:MM:ss
-      - PGID=1000
+      - PGID=1001
       - PUID=1000
       - TZ=Europe/Berlin
     labels:
@@ -22,6 +21,6 @@ volumes:
     name: scan
     driver: local
     driver_opts:
-      type: nfs
+      type: nfs4
       o: addr=${NFS_SERVER},rw
-      device: ":${PFAD}"
+      device: ":${PFAD}"

imapfilter/README.md

@@ -0,0 +1,11 @@
+<h2>IMAP-Filter</H2>
+<p></p>
+<p></p>
+<img src="https://gnulinux.ch/bl-content/uploads/pages/b0acef4f64d6f73352cdcc0b9f1c946a/brett-jordan-LPZy4da9aRo-unsplash.jpg" alt="IMAP-Filter" width="200" />
+<p></p>
+<p></p>
+<p><b>IMAP-Filter</b> ist ein E-Mail-Filterdienstprogramm. Es stellt eine Verbindung zu Remote-Mailservern her und sendet mithilfe des Internet Message Access Protocol (IMAP) Suchanfragen an den Server. Es verarbeitet Postfächer basierend auf den Ergebnissen. Es kann verwendet werden zum Löschen, kopieren, verschieben, kennzeichnen usw. von Nachrichten, die sich gleichzeitig in Postfächern oder auf verschiedene Mailservern befinden.
+</p>
+<p></p>
+<a href="https://github.com/lefcha/imapfilter" target="_blank">IMAP-Filter</a>
+<p></p>

imapfilter/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "2"
 services:
   imapfilter:
     build: .
@@ -8,4 +7,4 @@ services:
       - ./config.lua:/volume/configuration/config.lua:ro
     labels:
       com.centurylinklabs.watchtower.enable: "false"
-    restart: always
+    restart: always

immich/.env.sample

@@ -0,0 +1,26 @@
+# You can find documentation for all the supported env variables at https://immich.app/docs/install/environment-variables
+
+# The location where your uploaded files are stored
+UPLOAD_LOCATION=Immich
+
+# The Immich version to use. You can pin this to a specific version like "v1.71.0"
+IMMICH_VERSION=release
+
+# Connection secrets for postgres and typesense. You should change these to random passwords
+TYPESENSE_API_KEY=some-random-text
+DB_PASSWORD=ChangeMe
+IMMICH_HOST=0.0.0.0
+PUBLIC_URL=https://immich.domain.de
+
+# The values below this line do not need to be changed
+###################################################################################
+DB_HOSTNAME=immich_postgres
+DB_USERNAME=postgres
+DB_DATABASE_NAME=immich
+
+REDIS_HOSTNAME=immich_redis
+
+# NFS Share
+###################################################################################
+NFS_SERVER=192.168.0.xxx
+PFAD=/pfad/zum/nfs/share

immich/README.md

@@ -0,0 +1,11 @@
+<h2>Immich</H2>
+<p></p>
+<p></p>
+<img src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTEZ3wPH-RD0U8S7h9Zovh4jMEUINrBBIeD-g&s" alt="Immich" width="200" />
+<p></p>
+<p></p>
+<p><b>Immich</b> ist eine High Performance self-hosted Foto und Video Management Lösung.
+</p>
+<p></p>
+<a href="https://immich.app/" target="_blank">Immich</a>
+<p></p>

immich/docker-compose.yml

@@ -0,0 +1,63 @@
+services:
+  immich-server:
+    container_name: immich_server
+    image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
+    volumes:
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
+      - /etc/localtime:/etc/localtime:ro
+    env_file:
+      - .env
+    ports:
+      - 2283:2283
+    depends_on:
+      - redis
+      - database
+    labels:
+      - "com.centurylinklabs.watchtower.monitor-only=true"
+    restart: always
+
+  immich-machine-learning:
+    container_name: immich_machine_learning
+    image: ghcr.io/immich-app/immich-machine-learning:${IMMICH_VERSION:-release}
+    volumes:
+      - ./model-cache:/cache
+    env_file:
+      - .env
+    labels:
+      - "com.centurylinklabs.watchtower.monitor-only=true"
+    restart: always
+
+  redis:
+    container_name: immich_redis
+    image: redis:6.2-alpine
+    volumes:
+      - ./redis:/data
+    labels:
+      - "com.centurylinklabs.watchtower.monitor-only=true"
+    restart: always
+
+  database:
+    container_name: immich_postgres
+    image: tensorchord/pgvecto-rs:pg14-v0.2.0
+    env_file:
+      - .env
+    environment:
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_USER: ${DB_USERNAME}
+      POSTGRES_DB: ${DB_DATABASE_NAME}
+      POSTGRES_INITDB_ARGS: '--data-checksums'
+    volumes:
+      - ./DB-data:/var/lib/postgresql/data
+    labels:
+      - "com.centurylinklabs.watchtower.monitor-only=true"
+    command: ["postgres", "-c", "shared_preload_libraries=vectors.so", "-c", 'search_path="$$user", public, vectors', "-c", "logging_collector=on", "-c", "max_wal_size=2GB", "-c", "shared_buffers=512MB", "-c", "wal_compression=on"]
+    restart: always
+
+volumes:
+  Immich:
+    name: Immich
+    driver: local
+    driver_opts:
+      type: nfs4
+      o: addr=${NFS_SERVER},rw
+      device: ":${PFAD}"

jdownloader/.env.sample

@@ -0,0 +1,10 @@
+# MyJDownloader
+###################################################################################
+MYJ_MAIL=mail@domain.de
+MYJ_PASSWORD=ChangeMe
+
+
+# NFS Share
+###################################################################################
+NFS_SERVER=192.168.0.xxx
+PFAD=/Pfad/zum/Ziel

jdownloader/README.md

@@ -0,0 +1,11 @@
+<h2>jDownloader</H2>
+<p></p>
+<p></p>
+<img src="https://upload.wikimedia.org/wikipedia/commons/f/f7/Jdownloader.png" alt="jDownloader" width="200" />
+<p></p>
+<p></p>
+<p><b>jDownloader</b> ist ein in Java geschriebener Download-Manager, der primär für das automatisierte Herunterladen bei Sharehostern entwickelt wurde. Zusätzlich ermöglicht das Programm das Herunterladen von Videos von Videoportalen wie z. B. YouTube.
+</p>
+<p></p>
+<a href="https://adguard.com/de/adguard-home/overview.html/" target="_blank">jDownloader</a>
+<p></p>

jdownloader/docker-compose.yml

@@ -0,0 +1,28 @@
+services:
+  jdownloader-2:
+    image: jlesage/jdownloader-2
+    container_name: jdownloader2
+    ports:
+      - 5800:5800
+      - 3129:3129
+    environment:
+      - PUID=1000
+      - PGID=1001
+      - LANG=de_DE.UTF-8
+      - TZ=Europe/Berlin
+      - KEEP_APP_RUNNING=1
+      - MYJDOWNLOADER_EMAIL=${MAIL}
+      - MYJDOWNLOADER_PASSWORD=${PASSWORD}
+      - MYJDOWNLOADER_DEVICE_NAME=Docker
+    volumes:
+      - ./config:/config
+      - jdownloader:/output
+
+volumes:
+  jdownloader:
+    name: jdownloader
+    driver: local
+    driver_opts:
+      type: nfs4
+      o: addr=${NFS_SERVER},rw
+      device: ":${PFAD}"

jellyfin/.env.sample

@@ -1,2 +1,5 @@
-NFS_SERVER=192.168.0.xxx 	# oder hostname oder Domain
-PFAD_HD=/Pfad/zum/Ordner/HD
+NFS_SERVER=192.168.0.xxx
+PFAD=/Pfad/zu/den/Videos
+#
+# Auf Rechte achten
+#

jellyfin/docker-compose.yml

@@ -1,32 +1,28 @@
----
-version: "2.1"
 services:
   jellyfin:
-    image: lscr.io/linuxserver/jellyfin
+    image: lscr.io/linuxserver/jellyfin:latest
     container_name: jellyfin
     environment:
       - PUID=1000
-      - PGID=1000
+      - PGID=1001
       - TZ=Europe/Berlin
-      - JELLYFIN_PublishedServerUrl=192.168.0.111
-    devices:
-      - /dev/dri:/dev/dri
+      #- JELLYFIN_PublishedServerUrl=http://192.168.0.5 #optional
     volumes:
       - ./config:/config
-      - ./tvseries:/data/tvshows
-      - hd:/data/movies
+      #- /path/to/tvseries:/data/tvshows
+      - video:/data/movies
     ports:
-      - 8096:8096
-      - 8920:8920 #optional
-      - 7359:7359/udp #optional
-      - 1905:1900/udp #optional
+      - 8097:8096
+      #- 8920:8920 #optional
+      #- 7359:7359/udp #optional
+      #- 1900:1900/udp #optional
     restart: unless-stopped
 
 volumes:
-  hd:
-    name: hd
+  video:
+    name: video
     driver: local
     driver_opts:
-      type: nfs
+      type: nfs4
       o: addr=${NFS_SERVER},rw
-      device: ":${PFAD_HD}"
+      device: ":${PFAD}"

joplin/.env.sample

@@ -1,3 +0,0 @@
-POSTGRES_PASSWORD=ChangeMe
-POSTGRES_USER=BENUTZER
-APP_BASE_URL=https://joplin.your-domain.de

joplin/docker-compose.yml

@@ -1,49 +0,0 @@
-# This is a sample docker-compose file that can be used to run Joplin Server
-# along with a PostgreSQL server.
-#
-# Update the following fields in the stanza below:
-#
-# POSTGRES_USER
-# POSTGRES_PASSWORD
-# APP_BASE_URL
-#
-# APP_BASE_URL: This is the base public URL where the service will be running.
-#	- If Joplin Server needs to be accessible over the internet, configure APP_BASE_URL as follows: https://example.com/joplin. 
-#	- If Joplin Server does not need to be accessible over the internet, set the the APP_BASE_URL to your server's hostname. 
-#     For Example: http://[hostname]:22300. The base URL can include the port.
-# APP_PORT: The local port on which the Docker container will listen. 
-#	- This would typically be mapped to port to 443 (TLS) with a reverse proxy.
-#	- If Joplin Server does not need to be accessible over the internet, the port can be mapped to 22300.
-
-version: '3'
-
-services:
-    db:
-        image: postgres:13
-        container_name: joplin_db
-        volumes:
-            - ./data/postgres:/var/lib/postgresql/data
-        ports:
-            - "5432:5432"
-        restart: unless-stopped
-        environment:
-            - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-            - POSTGRES_USER=${POSTGRES_USER}
-            - POSTGRES_DB=joplin
-    app:
-        image: joplin/server:latest
-        container_name: joplin_app
-        depends_on:
-            - db
-        ports:
-            - "22300:22300"
-        restart: unless-stopped
-        environment:
-            - APP_PORT=22300
-            - APP_BASE_URL=${APP_BASE_URL}
-            - DB_CLIENT=pg
-            - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-            - POSTGRES_DATABASE=joplin
-            - POSTGRES_USER=${POSTGRES_USER}
-            - POSTGRES_PORT=5432
-            - POSTGRES_HOST=db

kasm/docker-compose.yml

@@ -0,0 +1,22 @@
+services:
+  kasm:
+    image: lscr.io/linuxserver/kasm:latest
+    container_name: kasm
+    privileged: true
+    security_opt:
+      - apparmor:rootlesskit #optional
+    environment:
+      - KASM_PORT=8443
+      - TZ=Europe/Berlin
+      - PGID=1000
+      - PUID=1001
+
+    volumes:
+      - ./data:/opt
+      - ./profiles:/profiles
+      - ./dev/input:/dev/input
+      - ./run/udev/data:/run/udev/data
+    ports:
+      - 3001:3000
+      - 8443:8443
+    restart: unless-stopped

knxd/README.md

@@ -0,0 +1,91 @@
+<h2>knxd</H2>
+<p></p>
+<p></p>
+<img src="https://bookstack.borgal.de/uploads/images/gallery/2021-04/1200px-knx-logo.png" alt="knxd" width="200" />
+<p></p>
+<p></p>
+<p><b>knxd</b> ist ein weit verbreitetes Protokoll für die Gebäudeautomation, das über eine dedizierte 9600-Baud-Leitung sowie IP-Multicast läuft. knxd ist ein fortschrittlicher Router/Gateway, der auf jedem Linux-Computer läuft. Es kann mit allen bekannten KNX-Schnittstellen kommunizieren.
+</p>
+<p></p>
+<a href="https://github.com/henfri/docker" target="_blank">knxd v0.12.6</a>
+<p></p>
+<h3>HowTo</h3>
+<hr>
+<p></p>
+<p>Config</p>
+<pre>services:
+    knxd:
+      image: henfri/knxd:v0.12.6
+      container_name: knxd
+      network_mode: "host"
+      command: knxd -t 1022 -e 1.1.250 -E 1.1.230:8 -f9 -DTRS -c -B single --send-delay=120 -b ipt:192.168.0.200
+      restart: always</pre>
+
+
+
+<p id="bkmrk--t-1022-und--f9-ist-" class="callout info">-t 1022 und -f9 ist f&uuml;r loggin, kann wenn es keine Probleme gibt auch aus geschaltet werden.</p>
+
+<p id="bkmrk-backup" class="callout danger"><strong><span style="color: #ff0000;">Schnittstelle ben&ouml;tigt ca. 1 Minute bis sie l&auml;uft.</span></strong></p>
+<p id="bkmrk-%C2%A0"></p>
+<h3 id="bkmrk-backup-0">Backup</h3>
+<hr id="bkmrk--0">
+<p id="bkmrk-ab-version-14-muss-m" class="callout warning"><span style="color: #ff0000;">Ab Version 14 muss mit config.ini Datei gearbeitet werden, gab bei mir Probleme daher wieder Version 12.6</span></p>
+<p id="bkmrk-%C2%A0-1"></p>
+<p id="bkmrk-docker-hub"><a href="https://hub.docker.com/r/tekn0ir/knxd" target="_blank" rel="noopener">Docker-Hub</a></p>
+<p id="bkmrk-docker-compose-beisp"><a href="https://github.com/julakali/smarthome-compose" target="_blank" rel="noopener">Docker-Compose Beispiel</a></p>
+<p id="bkmrk-original-aus-alter-k"><span style="color: #003366;"><em>Original aus alter knxd Config</em></span></p>
+<pre id="bkmrk-knxd_opts%3D%22-e-1.1.25"><code class="language-">KNXD_OPTS="-e 1.1.254 -E 1.1.200:8 -D -T -R -S -B single -b ipt:192.168.0.200"</code></pre>
+<p id="bkmrk-docker-compose.yml-0"><span style="color: #003366;"><em>docker-compose.yml</em></span></p>
+<pre id="bkmrk-version%3A-%273.4%27-servi"><code class="language-">version: '3.4'
+services:
+  knxd:
+    image: renehezser/knxd
+    container_name: knxd
+    ports:
+      - 6720:6720
+      - 3671:3671
+    volumes:
+      - /opt/knxd/config.ini:/config.ini
+    restart: always
+    network_mode: host</code></pre>
+<p id="bkmrk-config.ini"><span style="color: #003366;">config.ini</span></p>
+<pre id="bkmrk-%5Bmain%5D-name-%3D-knxd-a"><code class="language-">[main]
+name = knxd
+addr = 1.1.254
+client-addrs = 1.1.200:8
+connections = server,B.tcp,C.ipt
+cache = A.cache
+systemd = systemd
+
+[server]
+debug = debug-server
+discover = true
+router = router
+server = ets_router
+tunnel = tunnel
+
+[B.tcp]
+server = knxd_tcp
+systemd-ignore = true
+filters = queue,D.filter
+
+[C.ipt]&cedil;
+driver = ipt
+retry-delay = 30
+filters = single,queue,D.filter
+ip-address = 192.168.0.200
+debug = debug-server
+
+[D.filter]
+delay = 20
+filter = pace
+
+[debug-server]
+name = mcast:knxd
+#error-level = 0x9
+#trace-mask = 0xffc</code></pre>
+<p id="bkmrk-%C2%A0-2"></p>
+<p id="bkmrk-service-auf-services">Service auf Serviceserver disabled</p>
+<pre id="bkmrk-systemctl-disable-kn"><code class="language-">systemctl disable knxd.socket
+systemctl disable knxd.service</code></pre>
+<p id="bkmrk-%C2%A0-3"></p>

knxd/docker-compose.yml

@@ -1,13 +1,18 @@
-version: "2"
 services:
     knxd:
       image: henfri/knxd:v0.12.6
       container_name: knxd
       network_mode: "host"
+      logging:
+          options:
+              max-file: '2'
+              max-size: 10m
       restart: always
+
 #
-# mit logging, wenn es zu Problemen kommt - zum aktivieren muss der Container entfernt werden!!!
-      command: knxd -t 1022 -e 1.1.250 -E 1.1.210:49 -f9 -DTRS -c -B single --send-delay=120 -b ipt:192.168.0.200
+# mit logging, wenn es zu Problemen kommt
+      command: knxd -e 1.1.250 -E 1.1.210:10 -f6 -t1023 -DTRS -c -B single --send-delay=150 -b ipt:192.168.0.200
 #
-# ohne logging
-#      command: knxd -e 1.1.250 -E 1.1.210:30 -DTRS -c -i --send-delay=120 -B single -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=30 -b ipt:192.168.0.200

mealie/README.md

@@ -0,0 +1,11 @@
+<h2>Mealie</H2>
+<p></p>
+<p></p>
+<img src="https://static-00.iconduck.com/assets.00/mealie-icon-512x489-939jw8dj.png" width="200" />
+<p></p>
+<p></p>
+<p><b>Mealie</b> ist eine intuitive und einfach zu bedienende Rezeptverwaltungs-App. Es wurde entwickelt, um Ihnen das Leben zu erleichtern, indem es das beste Rezeptverwaltungserlebnis im Internet bietet und Ihnen eine benutzerfreundliche Oberfläche zur Verwaltung Ihrer wachsenden Rezeptsammlung bietet.
+</p>
+<p></p>
+<a href="https://mealie.io/" target="_blank">Mealie</a>
+<p></p>

mealie/docker-compose.yml

@@ -0,0 +1,41 @@
+services:
+  mealie:
+    container_name: mealie
+    image: hkotel/mealie:latest
+    restart: unless-stopped
+    volumes:
+      - ./data:/app/data
+    ports:
+      - 9925:9000
+    environment:
+      ALLOW_SIGNUP: "false"
+      BASE_URL: "https://rezepte.borgal.de"
+      API_DOCS: "false"
+
+      DB_ENGINE: sqlite # Optional: 'sqlite', 'postgres'
+      # =====================================
+      # Postgres Config
+      POSTGRES_USER: mealie
+      POSTGRES_PASSWORD: mealie
+      POSTGRES_SERVER: postgres
+      POSTGRES_PORT: 5432
+      POSTGRES_DB: mealie
+
+      # Webworker
+      # =====================================
+      # Web Concurrency
+      WEB_GUNICORN: "false"
+      WORKERS_PER_CORE: 0.5
+      MAX_WORKERS: 1
+      WEB_CONCURRENCY: 1
+
+      # Mail settings
+      # =====================================
+      # Email Configuration
+      # SMTP_HOST=
+      # SMTP_PORT=587
+      # SMTP_FROM_NAME=Mealie
+      # SMTP_AUTH_STRATEGY=TLS # Options: 'TLS', 'SSL', 'NONE'
+      # SMTP_FROM_EMAIL=
+      # SMTP_USER=
+      # SMTP_PASSWORD=

mumble/README.md

@@ -0,0 +1,11 @@
+<h2>Mumble</H2>
+<p></p>
+<p></p>
+<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/8/8f/Icons_mumble.svg/1024px-Icons_mumble.svg.png" width="200" />
+<p></p>
+<p></p>
+<p><b>Mumble</b> ist eine freie Sprachkonferenzsoftware, die sich wegen niedriger Latenzzeit und guter Audioqualität unter anderem für den Einsatz parallel zu Onlinespielen eignet.
+</p>
+<p></p>
+<a href="https://www.mumble.info/" target="_blank">Mumble</a>
+<p></p>

mumble/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   murmur:
     image: vimagick/murmur
@@ -9,4 +7,4 @@ services:
     ports:
       - "64738:64738/tcp"
       - "64738:64738/udp"
-    restart: always
+    restart: always

node-red/README.md

@@ -0,0 +1,11 @@
+<h2>Node-RED</H2>
+<p></p>
+<p></p>
+<img src="https://blog.quindorian.org/wp-content/uploads/2019/05/node-red-logo.png" width="200" />
+<p></p>
+<p></p>
+<p><b>Node-RED</b> ist ein von IBM entwickeltes grafisches Entwicklungswerkzeug. Die Software ermöglicht es, Anwendungsfälle im Bereich des Internets der Dinge mit einem einfachen Baukastenprinzip umzusetzen. Die einzelnen Funktionsbausteine werden durch Ziehen von Verbindungen verbunden.
+</p>
+<p></p>
+<a href="https://nodered.org/" target="_blank">Node-RED</a>
+<p></p>

node-red/docker-compose.yml

@@ -1,5 +1,3 @@
-version: '2.1'
-
 services:
   nodered:
     container_name: node-red
@@ -7,11 +5,12 @@ services:
     user: 0:0
     ports:
       - 1880:1880
+      - 1883:1883
     volumes:
       - ./data:/data
     environment:
       - TZ=Europe/Berlin
-#      - PGID=1000
-#      - PUID=1000
+      #- PGID=1000
+      #- PUID=1000
     restart: always
-#    network_mode: host
+    network_mode: host

onlyoffice/.env.sample

@@ -0,0 +1 @@
+SECRET=ChangeMe

onlyoffice/README.md

@@ -0,0 +1,11 @@
+<h2>OnlyOffice</H2>
+<p></p>
+<p></p>
+<img src="https://media.graphassets.com/X8UAyIhwQom80fua3x8T" width="200" />
+<p></p>
+<p></p>
+<p><b>OnlyOffice</b> ist ein neues Office-Programm, das auf Geschwindigkeit und Cloud-Anbindung setzt. Gleichzeitig werden alle Formate von MS Office unterstützt (DOCX, XLSX, PPTX), auch Open-Document Formate können problemlos bearbeitet werden. Zwar kommt das Open-Source-Programm bislang mit weniger Features aus als die Konkurrenz, punktet dafür aber mit innovativen Neuerungen..
+</p>
+<p></p>
+<a href="https://www.onlyoffice.com/de/" target="_blank">OnlyOffice</a>
+<p></p>

onlyoffice/docker-compose.yml

@@ -0,0 +1,19 @@
+services:
+  onlyoffice-document-server:
+    container_name: onlyoffice-document-server
+    image: onlyoffice/documentserver
+    stdin_open: true
+    tty: true
+    restart: always
+    environment:
+     - JWT_SECRET=${SECRET}
+    ports:
+      - 8016:80
+    volumes:
+       - ./document_log:/var/log/onlyoffice
+       - ./document_data:/var/www/onlyoffice/Data
+       - ./document_lib:/var/lib/onlyoffice
+       - ./fonts:/usr/share/fonts/truetype/custom
+       - ./redis:/var/lib/redis
+       - ./db:/var/lib/postgresql
+       - ./rabbitmq:/var/lib/rabbitmq

openhab/docker-compose.yml

@@ -1,26 +0,0 @@
-version: '2.2'
-
-services:
-  openhab:
-    image: "openhab/openhab:3.0.1"
-    container_name: openhab
-    restart: always
-    network_mode: host
-    volumes:
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/etc/timezone:/etc/timezone:ro"
-      - "./openhab_addons:/openhab/addons"
-      - "./openhab_conf:/openhab/conf"
-      - "./openhab_userdata:/openhab/userdata"
-    environment:
-      OPENHAB_HTTP_PORT: "8081"
-      OPENHAB_HTTPS_PORT: "8444"
-      EXTRA_JAVA_OPTS: "-Duser.timezone=Europe/Berlin"
-
-volumes:
-  openhab_addons:
-    driver: local
-  openhab_conf:
-    driver: local
-  openhab_userdata:
-    driver: local

owncloud/.env.sample

@@ -0,0 +1,4 @@
+OWNCLOUD_DOMAIN=owncloud.domain.de
+OWNCLOUD_TRUSTED_DOMAINS=owncloud.domain.de
+ADMIN_USERNAME=ChangeMe
+ADMIN_PASSWORD=ChangeMe

owncloud/README.md

@@ -0,0 +1,11 @@
+<h2>OwnCloud</H2>
+<p></p>
+<p></p>
+<img src="https://www.etes.de/files/etes/logo/ownCloud_Logo.png" alt="Owncloud" width="200" />
+<p></p>
+<p></p>
+<p><b>OwnCloud</b> ist ein Open-Source-Software-Projekt, das eine Content Collaboration Plattform für den Einsatz in Unternehmen entwickelt, die das Speichern, Verteilen und gleichzeitige Bearbeiten von Daten auf eigenen Servern und Endgeräten organisiert..
+</p>
+<p></p>
+<a href="https://owncloud.com/de/" target="_blank">OwnCloud</a>
+<p></p>

owncloud/docker-compose.yml

@@ -0,0 +1,62 @@
+services:
+  owncloud:
+    image: owncloud/server
+    container_name: owncloud_server
+    restart: always
+    ports:
+      - 8013:8080
+    depends_on:
+      - mariadb
+      - redis
+    environment:
+      - OWNCLOUD_DOMAIN=${OWNCLOUD_DOMAIN}
+      - OWNCLOUD_TRUSTED_DOMAINS=${OWNCLOUD_TRUSTED_DOMAINS}
+      - OWNCLOUD_DB_TYPE=mysql
+      - OWNCLOUD_DB_NAME=owncloud
+      - OWNCLOUD_DB_USERNAME=owncloud
+      - OWNCLOUD_DB_PASSWORD=owncloud
+      - OWNCLOUD_DB_HOST=mariadb
+      - OWNCLOUD_ADMIN_USERNAME=${ADMIN_USERNAME}
+      - OWNCLOUD_ADMIN_PASSWORD=${ADMIN_PASSWORD}
+      - OWNCLOUD_MYSQL_UTF8MB4=true
+      - OWNCLOUD_REDIS_ENABLED=true
+      - OWNCLOUD_REDIS_HOST=redis
+#    healthcheck:
+#      test: ["CMD", "/usr/bin/healthcheck"]
+#      interval: 30s
+#      timeout: 10s
+#      retries: 5
+    volumes:
+      - ./files:/mnt/data
+
+
+  mariadb:
+    image: mariadb:10.11
+    container_name: owncloud_mariadb
+    restart: always
+    environment:
+      - MYSQL_ROOT_PASSWORD=owncloud
+      - MYSQL_USER=owncloud
+      - MYSQL_PASSWORD=owncloud
+      - MYSQL_DATABASE=owncloud
+    command: ["--max-allowed-packet=128M", "--innodb-log-file-size=64M"]
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-u", "root", "--password=owncloud"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    volumes:
+      - ./mysql:/var/lib/mysql
+
+  redis:
+    image: redis:6
+    container_name: owncloud_redis
+    restart: always
+    command: ["--databases", "1"]
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+    volumes:
+      - ./redis:/data

paperless/README.md

@@ -0,0 +1,160 @@
+<h2>Paperless ngx</H2>
+<p></p>
+<p></p>
+<img src="https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/paperless-ngx-banner.png" alt="Paperless" width="200" />
+<p></p>
+<p></p>
+<p><b>Paperless ngx</b> ist ein von der Community unterstütztes Open-Source-Dokumentenverwaltungssystem, das Ihre physischen Dokumente in ein durchsuchbares Online-Archiv umwandelt, sodass Sie weniger Papier benötigen.
+</p>
+<p></p>
+<a href="https://docs.paperless-ngx.com/" target="_blank">Paperless ngx</a>
+<p></p>
+<h2>HowTo</h2>
+<hr>
+<p></p>
+<h4>/etc/fstab Mount zu Scanner Verzeichniss</h4>
+<p></p>
+<pre>192.168.0.102:/mnt/pool1/scanner /opt/paperless/consume nfs auto 0 0</pre>
+<p></p>
+<h5>gegebenfalls noch die NFS Tools installieren</h5>
+<pre>apt install nfs-common</pre>
+<p></p>
+
+
+# Update Paperless-ngx mit DB-upgrade !
+
+### Schritt 1: Datenbank sichern und vorbereiten
+
+1.  **Stoppen Sie den `webserver`-Dienst**, um zu verhindern, dass die Anwendung während des Backups Daten in die Datenbank schreibt. Der `db`-Dienst muss dabei **laufen**.
+
+    ```
+    docker compose stop webserver
+    
+    ```
+    
+2.  **Überprüfen Sie, ob der `db`-Dienst läuft**.
+
+    ```
+    docker compose ps
+    
+    ```
+    
+    Der Status von `paperless_db` sollte `Up` sein. Wenn er nicht läuft, müssen Sie die Logs mit `docker compose logs db` überprüfen, um das Problem zu beheben, bevor Sie fortfahren.
+    
+3.  **Führen Sie den Backup-Befehl aus**. Dieser Befehl startet `pg_dump` innerhalb des laufenden `db`-Containers und speichert die Ausgabe in eine Datei auf Ihrem Host.
+
+    ```
+    docker compose exec db pg_dump -U paperless -Fc paperless > paperless_db_backup.dump
+    
+    ```
+    
+    Eine komprimierte Backup-Datei namens `paperless_db_backup.dump` wird im selben Verzeichnis wie Ihre `docker-compose.yml` erstellt.
+    
+
+----------
+
+### Schritt 2: `docker-compose.yml` aktualisieren
+
+1.  **Stoppen Sie alle Dienste**, um eine saubere Ausgangsbasis zu schaffen.
+    
+    ```
+    docker compose down
+    
+    ```
+    
+2.  **Bearbeiten Sie Ihre `docker-compose.yml`-Datei.**
+    
+    -   Ändern Sie das `image` für den `db`-Dienst von `postgres:13` auf `postgres:17`.
+        
+    -   **Wichtig:** Ändern Sie den `volumes`-Pfad für die neuen Datenbankdaten, um zu verhindern, dass die alten Daten überschrieben werden. PostgreSQL-Versionen sind nicht direkt kompatibel.
+        
+    
+    YAML
+    
+    ```
+    # ...
+    services:
+      # ...
+      db:
+        image: docker.io/library/postgres:17 # Version geändert
+        container_name: paperless_db
+        restart: unless-stopped
+        volumes:
+          - ./db_v17_data:/var/lib/postgresql/data # WICHTIG: Pfad geändert
+        environment:
+          POSTGRES_DB: paperless
+          POSTGRES_USER: paperless
+          POSTGRES_PASSWORD: paperless
+        labels:
+          - "com.centurylinklabs.watchtower.monitor-only=true"
+    # ...
+    
+    ```
+    
+3.  **Starten Sie nur den neuen Datenbank-Container**.
+    
+    
+    ```
+    docker compose up -d db
+    
+    ```
+    
+    Dadurch wird ein neuer, leerer PostgreSQL 17-Container erstellt.
+    
+    
+4.  **Importieren über einen temporären Ordner**.
+
+    
+    ```
+    docker compose cp paperless_db_backup.dump db:/tmp/paperless_db_backup.dump
+    
+    ```
+    
+    Dieser Befehl kopiert Ihre lokale Backup-Datei in das `/tmp`-Verzeichnis des laufenden `db`-Containers.
+    
+2.  **Stellen Sie das Backup im Container wieder her:**
+    
+    
+    ```
+    docker compose exec db sh -c "pg_restore -U paperless -d paperless /tmp/paperless_db_backup.dump"
+    
+    ```
+    
+    Hierbei übergeben Sie den Pfad der Datei direkt an den `pg_restore`-Befehl, anstatt die Eingabe umzuleiten.
+    
+### Letzter Schritt: Dienste starten und bereinigen
+
+1.  **Starten Sie die Paperless-ngx-Dienste:** Führen Sie den folgenden Befehl aus, um alle Dienste, einschließlich des `webserver`s, zu starten.
+    
+    Bash
+    
+    ```
+    docker compose up -d
+    
+    ```
+    
+2.  **Überprüfen Sie die Funktionalität:** Öffnen Sie die Paperless-ngx-Weboberfläche in Ihrem Browser. Melden Sie sich an und überprüfen Sie, ob Ihre Dokumente korrekt angezeigt werden und die Anwendung wie erwartet funktioniert.
+    
+3.  **Bereinigen Sie die temporären Dateien:** Wenn alles einwandfrei läuft, können Sie die erstellten Sicherungsdateien löschen.
+    
+    Bash
+    
+    ```
+    rm paperless_db_backup.dump
+    
+    ```
+    
+    Sie können auch das alte Datenbank-Volume löschen, um Speicherplatz freizugeben.
+    
+4.  **Löschen Sie die alte Datenbank (optional):** Falls Sie das alte Datenbank-Volume nicht mehr benötigen, können Sie es ebenfalls entfernen. **Seien Sie hier vorsichtig, um keine wichtigen Daten zu verlieren.**
+    
+    Bash
+    
+    ```
+    docker volume ls # find the old volume name
+    docker volume rm <old_volume_name>
+    
+    ```
+    
+
+Herzlichen Glückwunsch, Ihre PostgreSQL-Datenbank wurde erfolgreich von Version 13 auf 17 migriert!

paperless/docker-compose.env

@@ -12,7 +12,7 @@ USERMAP_GID=1001
 # default.
 # See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster
 # for available languages.
-#PAPERLESS_OCR_LANGUAGES=tur ces
+# PAPERLESS_OCR_LANGUAGES=tur ces
 
 ###############################################################################
 # Paperless-specific settings                                                 #
@@ -24,7 +24,7 @@ USERMAP_GID=1001
 
 # Adjust this key if you plan to make paperless available publicly. It should
 # be a very long sequence of random characters. You don't need to remember it.
-#PAPERLESS_SECRET_KEY=change-me
+# PAPERLESS_SECRET_KEY=change-me
 
 # Use this variable to set a timezone for the Paperless Docker containers. If not specified, defaults to UTC.
 PAPERLESS_TIME_ZONE=Europe/Berlin
@@ -32,7 +32,17 @@ PAPERLESS_TIME_ZONE=Europe/Berlin
 # The default language to use for OCR. Set this to the language most of your
 # documents are written in.
 PAPERLESS_OCR_LANGUAGE=deu
+PAPERLESS_OCR_LANGUAGES=deu
 
+# Eigene Einstellungen
+#
+# PAPERLESS_FILENAME_FORMAT_REMOVE_NONE=True
 PAPERLESS_FILENAME_FORMAT={document_type}/{correspondent}/{created_year}/{title}
-PAPERLESS_CONSUMER_POLLING=30
+PAPERLESS_CONSUMER_POLLING=10
 PAPERLESS_URL=https://dms.borgal.de
+PAPERLESS_PRE_CONSUME_SCRIPT=/usr/src/paperless/scripts/pre-consume.sh
+
+# QR Code Scanner
+PAPERLESS_CONSUMER_ENABLE_BARCODES=true
+PAPERLESS_CONSUMER_ENABLE_ASN_BARCODE=true
+PAPERLESS_CONSUMER_BARCODE_SCANNER=ZXING

paperless/docker-compose.yml

@@ -26,17 +26,16 @@
 # For more extensive installation and update instructions, refer to the
 # documentation.
 
-version: "3.4"
 services:
   broker:
-    image: redis:6.0
+    image: docker.io/library/redis:7
     container_name: paperless_redis
     volumes:
       - ./redis:/data
     restart: unless-stopped
 
   db:
-    image: postgres:13
+    image: docker.io/library/postgres:13
     container_name: paperless_db
     restart: unless-stopped
     volumes:
@@ -45,39 +44,56 @@ services:
       POSTGRES_DB: paperless
       POSTGRES_USER: paperless
       POSTGRES_PASSWORD: paperless
+    labels:
+      - "com.centurylinklabs.watchtower.monitor-only=true"
 
   webserver:
-   # image: jonaswinkler/paperless-ng:latest
-    image: ghcr.io/paperless-ngx/paperless-ngx
+    image: ghcr.io/paperless-ngx/paperless-ngx:latest
     container_name: paperless_app
     restart: unless-stopped
     depends_on:
       - db
       - broker
+      - gotenberg
+      - tika
     ports:
-      - 8009:8000
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8000"]
-      interval: 30s
-      timeout: 10s
-      retries: 5
+      - 8009:8000/tcp
     volumes:
       - ./data:/usr/src/paperless/data
-      - media:/usr/src/paperless/media
       - ./export:/usr/src/paperless/export
       - ./consume:/usr/src/paperless/consume
+      - ./scripts:/usr/src/paperless/scripts
+      - media:/usr/src/paperless/media
     env_file: docker-compose.env
     environment:
-      PUID: 1000
-      PGID: 1001
       PAPERLESS_REDIS: redis://broker:6379
       PAPERLESS_DBHOST: db
+      PAPERLESS_BIND_ADDR: 0.0.0.0
+      PAPERLESS_TIKA_ENABLED: 1
+      PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
+      PAPERLESS_TIKA_ENDPOINT: http://tika:9998
+
+  gotenberg:
+    image: docker.io/gotenberg/gotenberg:8.7
+    restart: unless-stopped
+
+    # The gotenberg chromium route is used to convert .eml files. We do not
+    # want to allow external content like tracking pixels or even javascript.
+    command:
+      - "gotenberg"
+      - "--chromium-disable-javascript=true"
+      - "--chromium-allow-list=file:///tmp/.*"
+      - "--api-timeout=60"
+
+  tika:
+    image: docker.io/apache/tika:latest
+    restart: unless-stopped
 
 volumes:
   media:
     name: media
     driver: local
     driver_opts:
-      type: nfs
+      type: nfs4
       o: addr=${NFS_SERVER},rw
-      device: ":${PFAD}"
+      device: ":${PFAD}"

paperless/scripts/pre-consume.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+set -x
+
+# Remove blank pages
+/usr/src/paperless/scripts/remove-blank-pages.sh

paperless/scripts/remove-blank-pages.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+#set -x -e -o pipefail
+set -e -o pipefail
+export LC_ALL=C
+
+#IN="$1"
+IN="$DOCUMENT_WORKING_PATH"
+
+# Check for PDF format
+TYPE=$(file -b "$IN")
+
+if [ "${TYPE%%,*}" != "PDF document" ]; then
+  >&2 echo "Skipping $IN - non PDF [$TYPE]."
+  exit 0
+fi
+
+# PDF file - proceed
+
+#PAGES=$(pdfinfo "$IN" | grep ^Pages: | tr -dc '0-9')
+PAGES=$(pdfinfo "$IN" | awk '/Pages:/ {print $2}')
+
+>&2 echo Total pages $PAGES
+
+
+# Threshold for HP scanners
+# THRESHOLD=1
+# Threshold for Lexmar MC2425
+THRESHOLD=0.8
+
+
+non_blank() {
+  for i in $(seq 1 $PAGES) ; do
+    PERCENT=$(gs -o -  -dFirstPage=${i} -dLastPage=${i} -sDEVICE=ink_cov "${IN}" | grep CMYK | nawk 'BEGIN { sum=0; } {sum += $1 + $2 + $3 + $4;} END {  printf "%.5f\n", sum } ')
+    >&2 echo -n "Color-sum in page $i is $PERCENT: "
+    if awk "BEGIN { exit !($PERCENT > $THRESHOLD) }"; then
+      echo $i
+      >&2 echo "Page added to document"
+    else
+      >&2 echo "Page removed from document"
+    fi
+  done
+}
+
+NON_BLANK=$(non_blank)
+
+if [ -n "$NON_BLANK" ]; then
+  NON_BLANK=$(echo $NON_BLANK  | tr ' ' ",")
+  qpdf "$IN" --warning-exit-0 --replace-input --pages . $NON_BLANK --
+fi

photoprism/.env.sample

@@ -1,8 +0,0 @@
-#MySQL Datenbank
-ADMIN_PASSWORD=ChangeMe
-DATABASE_PASSWORD=ChangeMe
-ROOT_PASSWORD=ChangeMe
-
-NFS_SERVER=192.168.0.xxx
-Photos=/mnt/Pfad/zu/den/Bildern
-cache=/mnt/Pfad/zu/dem/cache

photoprism/docker-compose.yml

@@ -1,114 +0,0 @@
-version: '3.5'
-
-# DOCKER COMPOSE COMMAND REFERENCE
-# see https://docs.photoprism.app/getting-started/docker-compose/#command-line-interface
-# --------------------------------------------------------------------------
-# Start    | docker-compose up -d
-# Stop     | docker-compose stop
-# Update   | docker-compose pull
-# Logs     | docker-compose logs --tail=25 -f
-# Terminal | docker-compose exec photoprism bash
-# Help     | docker-compose exec photoprism photoprism help
-# Config   | docker-compose exec photoprism photoprism config
-# Reset    | docker-compose exec photoprism photoprism reset
-# Backup   | docker-compose exec photoprism photoprism backup -a -i
-# Restore  | docker-compose exec photoprism photoprism restore -a -i
-# Index    | docker-compose exec photoprism photoprism index
-# Reindex  | docker-compose exec photoprism photoprism index -f
-# Import   | docker-compose exec photoprism photoprism import
-
-services:
-  photoprism:
-    image: photoprism/photoprism:latest
-    container_name: Photoprism_App
-    depends_on:
-      - mariadb
-    restart: unless-stopped
-    security_opt:
-      - seccomp:unconfined
-      - apparmor:unconfined
-    ports:
-      - "2342:2342"
-    environment:
-      PHOTOPRISM_ADMIN_PASSWORD: "${ADMIN_PASSWORD}"       # INITIAL PASSWORD FOR "admin" USER, MINIMUM 8 CHARACTERS
-      PHOTOPRISM_AUTH_MODE: "password"               # authentication mode (public, password)
-      PHOTOPRISM_SITE_URL: "http://docker:2342" # public server URL incl http:// or https:// and /path, :port is optional
-      PHOTOPRISM_ORIGINALS_LIMIT: 5000               # file size limit for originals in MB (increase for high-res video)
-      PHOTOPRISM_HTTP_COMPRESSION: "gzip"            # improves transfer speed and bandwidth utilization (none or gzip)
-      PHOTOPRISM_LOG_LEVEL: "info"                   # log level: trace, debug, info, warning, error, fatal, or panic
-      PHOTOPRISM_READONLY: "false"                   # do not modify originals directory (reduced functionality)
-      PHOTOPRISM_EXPERIMENTAL: "false"               # enables experimental features
-      PHOTOPRISM_DISABLE_CHOWN: "false"              # disables updating storage permissions via chmod and chown on startup
-      PHOTOPRISM_DISABLE_WEBDAV: "false"             # disables built-in WebDAV server
-      PHOTOPRISM_DISABLE_SETTINGS: "false"           # disables settings UI and API
-      PHOTOPRISM_DISABLE_TENSORFLOW: "false"         # disables all features depending on TensorFlow
-      PHOTOPRISM_DISABLE_FACES: "false"              # disables face detection and recognition (requires TensorFlow)
-      PHOTOPRISM_DISABLE_CLASSIFICATION: "false"     # disables image classification (requires TensorFlow)
-      PHOTOPRISM_DISABLE_RAW: "false"                # disables indexing and conversion of RAW files
-      PHOTOPRISM_RAW_PRESETS: "false"                # enables applying user presets when converting RAW files (reduces performance)
-      PHOTOPRISM_JPEG_QUALITY: 85                    # a higher value increases the quality and file size of JPEG images and thumbnails (25-100)
-      PHOTOPRISM_DETECT_NSFW: "false"                # automatically flags photos as private that MAY be offensive (requires TensorFlow)
-      PHOTOPRISM_UPLOAD_NSFW: "true"                 # allows uploads that MAY be offensive (no effect without TensorFlow)
-      PHOTOPRISM_DATABASE_DRIVER: "mysql"            # use MariaDB 10.5+ or MySQL 8+ instead of SQLite for improved performance
-      PHOTOPRISM_DATABASE_SERVER: "mariadb:3306"     # MariaDB or MySQL database server (hostname:port)
-      PHOTOPRISM_DATABASE_NAME: "photoprism"         # MariaDB or MySQL database schema name
-      PHOTOPRISM_DATABASE_USER: "photoprism"         # MariaDB or MySQL database user name
-      PHOTOPRISM_DATABASE_PASSWORD: "${DATABASE_PASSWORD}"        # MariaDB or MySQL database user password
-      PHOTOPRISM_SITE_CAPTION: "AI-Powered Photos App"
-      PHOTOPRISM_SITE_DESCRIPTION: ""                # meta site description
-      PHOTOPRISM_SITE_AUTHOR: "Borgal"               # meta site author
-      working_dir: "/photoprism"                     # do not change or remove
-
-      ## Run/install on first startup (options: update gpu tensorflow davfs clitools clean):
-      # PHOTOPRISM_INIT: "gpu tensorflow"
-      ## Hardware Video Transcoding (for sponsors only due to high maintenance and support costs):
-      # PHOTOPRISM_FFMPEG_ENCODER: "software"        # FFmpeg encoder ("software", "intel", "nvidia", "apple", "raspberry")
-      # PHOTOPRISM_FFMPEG_BITRATE: "32"              # FFmpeg encoding bitrate limit in Mbit/s (default: 50)
-      ## Run as a non-root user after initialization (supported: 0, 33, 50-99, 500-600, and 900-1200):
-      PHOTOPRISM_UID: 1000
-      PHOTOPRISM_GID: 1001
-      PHOTOPRISM_UMASK: 0002
-      user: "1000:1001"
-
-    volumes:
-      - "./storage:/photoprism/storage"                 # *Writable* storage folder for cache, database, and sidecar files (DO NOT REMOVE)
-      - "storage:/photoprism/storage/cache/thumbnails"             # Original media files (DO NOT REMOVE)
-      - "Photos:/photoprism/originals"                  # *Additional* media folders can be mounted like this
-      #- "./Pictures:/photoprism/originals"             # Original media files (DO NOT REMOVE)
-      #- "Photos:/photoprism/originals/Digicam-Bilder"  # *Additional* media folders can be mounted like this
-      #- "~/Import:/photoprism/import"                  # *Optional* base folder from which files can be imported to originals
-
-  ## Database Server (recommended)
-  mariadb:
-    restart: unless-stopped
-    image: mariadb:10.9
-    container_name: Photoprism_DB
-    security_opt:
-      - seccomp:unconfined
-      - apparmor:unconfined
-    command: mysqld --innodb-buffer-pool-size=512M --transaction-isolation=READ-COMMITTED --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --max-connections=512 --innodb-rollback-on-timeout=OFF --innodb-lock-wait-timeout=120
-    volumes:
-      - "./database:/var/lib/mysql"
-    environment:
-      MARIADB_AUTO_UPGRADE: "1"
-      MARIADB_INITDB_SKIP_TZINFO: "1"
-      MARIADB_DATABASE: "photoprism"
-      MARIADB_USER: "photoprism"
-      MARIADB_PASSWORD: "${DATABASE_PASSWORD}"
-      MARIADB_ROOT_PASSWORD: "${ROOT_PASSWORD}"
-
-volumes:
-  Photos:
-    name: Photos
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=${NFS_SERVER},rw
-      device: ":${Photos}"
-  storage:
-    name: storage
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=${NFS_SERVER},rw
-      device: ":${cache}"

portainer/README.md

@@ -1,2 +1,11 @@
-<p id="bkmrk-"><a href="https://bookstack.borgal.de/uploads/images/gallery/2021-04/download.png" target="_blank" rel="noopener"><img src="https://bookstack.borgal.de/uploads/images/gallery/2021-04/scaled-1680-/download.png" alt="Download.png" /></a></p>
-<p id="bkmrk-docker-hub"><a href="https://hub.docker.com/r/portainer/portainer" target="_blank" rel="noopener">Docker-Hub</a></p>
+<h2>Portainer</H2>
+<p></p>
+<p></p>
+<img src="https://bookstack.borgal.de/uploads/images/gallery/2021-04/download.png" alt="Portainer" width="200" />
+<p></p>
+<p></p>
+<p><b>Portainer</b> ist Ihre Container-Management-Software zur Bereitstellung, Fehlerbehebung und Sicherung von Anwendungen in Cloud-, Rechenzentrums- und industriellen IoT-Anwendungsfällen.
+</p>
+<p></p>
+<a href="https://www.portainer.io/" target="_blank">Portainer</a>
+<p></p>

portainer/docker-compose.yml

@@ -1,4 +1,3 @@
-version: "2"
 services:
   portainer:
     container_name: portainer
@@ -9,4 +8,4 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
       - /opt/portainer:/data
-    restart: unless-stopped
+    restart: unless-stopped

ports.md

@@ -1,51 +1,58 @@
-Container           |   Ports
---------            |   -------- 
-adguard             |   53
-reverse-porxy       |   80
-reverse-porxy       |   81
-gitea               |   222
-reverse-porxy       |	443
-adguard             |	853
-adguard             |	1082
-adguard             |   1443
-node-red            |	1880
-adguard             |	3000
-gitea               |	3030
-bookstack_db        |	3306
-fredbed_db          |	3307
-webserver_db        |	3309
-unifi controller    |	3478
-whoogle			    |	5000
+Container           	|	Ports
+--------            	|	-------- 
+adguard             	|	53
+reverse-porxy       	|	80
+reverse-porxy       	|	81
+gitea               	|	222
+reverse-porxy       	|	443
+node-red            	|	1880
+node-red MQTT          	|	1883
+vdr			|	2004
+adguard             	|	3000
+wireshark            	|	3010
+vdr			|	3020
+gitea               	|	3030
+grafana			|	3090
+jdownloader		|	3129
+fredbed_db          	|	3307
+webserver_db        	|	3309
+unifi controller    	|	3478
+jdownloader		|	5800
+vdr			|	6419
 bookstack	        |	6875
 portainer	        |	8000
-gotify			    |	8001
-paperless           |   8009
-grocy			    |	8011
-filebrowser         |   8012
-filerun			|	8013
+gotify			|	8001
+dockge			|	8002
+wekan			|	8004
+vdr			|	8008
+paperless           	|	8009
+grocy			|	8011
+photoview		|	8012
+owncloud		|	8013
 webdav			|	8014
-unifi controller    |	8080
+onlyoffice		|	8016
+unifi controller    	|	8080
 openhab		        |	8081
 fredbed		        |	8083
-bitwarden           |	8084
-drawio              |   8085
-Uptime Kuma         |	8086
-webserver_phpmyadmin|	8087
-nextcloud_app       |	8088
-homeassistant       |	8123
+bitwarden           	|	8084
+drawio              	|	8085
+Uptime Kuma         	|	8086
+webserver_phpmyadmin	|	8087
+grafana influxdb	|	8096
+vdr			|	8099
+homeassistant       	|	8123
 heimdall	        |	8124
-heimdall	        |	8143
 webserver	        |	8180
 code-Server	        |	8181
-sshwifty            |   8182
-syncthing		|	8384	
-unifi controller    |	8443
+sshwifty            	|	8182
+duplicati		|	8200
 openhab		        |	8444
-drawio              |   8445
 youTubeDL	        |	8998
 portainer	        |	9000
-unifi controller    |	10001
-syncthing TCP		|	22000
-syncthing UDP		|	22000
-syncthing UDP		|	21027
-mumble	            |	64738
+mealie			|	9925
+dozzle			|	9999
+unifi controller    	|	10001
+vdr-vnsi		|	34890			
+wireguard		|	51820
+wireguard		|	51821
+mumble	            	|	64738

proxy/README.md

@@ -0,0 +1,11 @@
+<h2>Nginx Proxy Manager</H2>
+<p></p>
+<p></p>
+<img src="https://mialikescoffee.com/images/nginx_logo.png" alt="Nginx Proxy Manager" width="200" />
+<p></p>
+<p></p>
+<p><b>Nginx Proxy Manager</b> ist ein kostenloser, Open-Source-Proxy-Manager. Er bietet eine einfache und schnelle Oberfläche zum Konfigurieren und Verwalten von Proxy Hosts, einschließlich integriertem Letsencrypt. Dadurch muss man in den meisten Fällen weder die config Dateien manuell anfassen, noch sich um das SSL Zertifikat kümmern.
+</p>
+<p></p>
+<a href="https://nginxproxymanager.com/" target="_blank">Nginx Proxy Manager</a>
+<p></p>

proxy/docker-compose.yml

@@ -0,0 +1,14 @@
+services:
+  app:
+    image: 'jc21/nginx-proxy-manager:latest'
+    container_name: reverse-proxy
+    restart: unless-stopped
+    environment:
+      DISABLE_IPV6: 'true'
+    ports:
+      - '80:80'
+      - '81:81'
+      - '443:443'
+    volumes:
+      - ./data:/data
+      - ./letsencrypt:/etc/letsencrypt

reverse-proxy/.env.sample

@@ -1,3 +0,0 @@
-DB_PASSWORD=changeMe
-
-MYSQL_ROOT_PASSWORD=changeMe

reverse-proxy/docker-compose.yml

@@ -1,30 +0,0 @@
-version: '3'
-services:
-  app:
-    image: 'jc21/nginx-proxy-manager:latest'
-    container_name: nginx_app
-    restart: unless-stopped
-    ports:
-      - '80:80'
-      - '81:81'
-      - '443:443'
-    environment:
-      DB_MYSQL_HOST: "db"
-      DB_MYSQL_PORT: 3306
-      DB_MYSQL_USER: "nginx"
-      DB_MYSQL_PASSWORD: ${DB_PASSWORD}
-      DB_MYSQL_NAME: "nginx"
-    volumes:
-      - ./data:/data
-      - ./letsencrypt:/etc/letsencrypt
-  db:
-    image: 'jc21/mariadb-aria:latest'
-    container_name: nginx_db
-    restart: unless-stopped
-    environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
-      MYSQL_DATABASE: 'nginx'
-      MYSQL_USER: 'nginx'
-      MYSQL_PASSWORD: ${DB_PASSWORD}
-    volumes:
-      - ./data/mysql:/var/lib/mysql

sshwifty/README.md

@@ -0,0 +1,11 @@
+<h2>Sshwifty</H2>
+<p></p>
+<p></p>
+<img src="https://static-00.iconduck.com/assets.00/sshwifty-icon-2048x2048-pgotb3pw.png" alt="Sshwifty" width="200" />
+<p></p>
+<p></p>
+<p><b>Sshwifty</b> ist ein SSH- und Telnet-Client für das Web, mit dem Sie direkt über Ihren Webbrowser auf SSH- und Telnet-Dienste zugreifen können.
+</p>
+<p></p>
+<a href="https://github.com/nirui/sshwifty" target="_blank">Sshwifty</a>
+<p></p>

sshwifty/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   sshwifty:
     image: 'niruix/sshwifty:latest'

stirling_pdf/README.md

@@ -0,0 +1,13 @@
+<h2>Stirling PDF</H2>
+<p></p>
+<p></p>
+<img src="https://avatars.githubusercontent.com/u/139791695?v=4" alt="Stirling PDF" width="200" />
+<p></p>
+<p></p>
+<p><b>Stirling PDF</b> ist ein robustes, lokal gehostetes webbasiertes PDF-Manipulationstool mit Docker. Es ermöglicht Ihnen, verschiedene Vorgänge an PDF-Dateien durchzuführen, darunter Teilen, Zusammenführen, Konvertieren, Neuorganisieren, Hinzufügen von Bildern, Drehen, Komprimieren und mehr. Diese lokal gehostete Webanwendung verfügt nun über einen umfassenden Satz an Funktionen, die alle Ihre PDF-Anforderungen erfüllen.
+
+Alle Dateien und PDFs sind entweder ausschließlich auf der Clientseite vorhanden, befinden sich nur während der Aufgabenausführung im Serverspeicher oder befinden sich vorübergehend ausschließlich zur Ausführung der Aufgabe in einer Datei. Alle vom Benutzer heruntergeladenen Dateien werden zu diesem Zeitpunkt vom Server gelöscht..
+</p>
+<p></p>
+<a href="https://stirlingtools.com/" target="_blank">Stirling PDF</a>
+<p></p>

stirling_pdf/docker-compose.yml

@@ -0,0 +1,15 @@
+services:
+  stirling_pdf:
+    image: frooodle/s-pdf:latest
+    container_name: stirling_pdf
+    ports:
+      - 8003:8080
+    volumes:
+      - ./trainingData:/usr/share/tesseract-ocr/5/tessdata #Required for extra OCR languages
+      - ./Configs:/configs
+    #      - /location/of/customFiles:/customFiles/
+    #      - /location/of/logs:/logs/
+    environment:
+      - DOCKER_ENABLE_SECURITY=false
+    restart: unless-stopped
+      

unifi/.env.sample

@@ -0,0 +1 @@
+PASS=ChangeMe

unifi/README.md

@@ -0,0 +1,26 @@
+<h2>UniFi Network Application</H2>
+<p></p>
+<p></p>
+<img src="https://blog.ui.com/wp-content/uploads/2016/10/unifi-app-logo.png" alt="UniFi Network Application" width="200" />
+<p></p>
+<p></p>
+<p><b>UniFi Network Application</b> ist eine leistungsstarke Wireless-Software-Engine für Unternehmen, die sich ideal für Client-Bereitstellungen mit hoher Dichte eignet, die geringe Latenz und hohe Verfügbarkeitsleistung erforder.
+</p>
+<p></p>
+<a href="https://github.com/linuxserver/docker-unifi-network-application/" target="_blank">UniFi Network Application</a>
+<p></p>
+<h3>HowTo</h3>
+<p></p>
+<p><b>* * * A C H T U N G * * *</b></p>
+<p>init-mongo.js muss <b>vor dem ersten Start</b> in den Hauptordner kopiert werden. Das Passwort in der Datei muss ebenfalls angepasst werden.</p>
+<p></p>
+<hr>
+<p></p>
+<p>Falls die AP sich nicht automatisch verbinden, m&uuml;ssen die AP manuell per SSH angepasst werden&nbsp;</p>
+<pre>>ssh
+<p></p>
+IP des Ger&auml;tes oder Hostname (AP-OG, AP-EG,..)
+Username: Borgal
+Passwort: *******
+
+set-inform http://docker:8080/inform</pre>

unifi/docker-compose.yml

@@ -1,18 +1,49 @@
-version: "2.1"
 services:
-  unifi-controller:
-    image: ghcr.io/linuxserver/unifi-controller
-    container_name: unifi-controller
+  unifi-db:
+    image: docker.io/mongo:7
+    container_name: unifi-db
+    volumes:
+      - ./data:/data/db
+      - ./data/configdb:/data/configdb
+      - ./init-mongo.js:/docker-entrypoint-initdb.d/init-mongo.js:ro
+#    healthcheck:
+#      test: echo 'db.runCommand("ping").ok' | mongosh localhost:27017/test --quiet
+#      interval: 10s
+#      timeout: 10s
+#      retries: 5
+#      start_period: 20s
+    restart: unless-stopped
+
+  unifi-network-application:
+    image: lscr.io/linuxserver/unifi-network-application:latest
+    container_name: unifi-network-application
     environment:
+      - PUID=1000
+      - PGID=1000
       - TZ=Europe/Berlin
-      - PUID=0
-      - PGID=0
-      - MEM_LIMIT=1024M
+      - MONGO_USER=unifi
+      - MONGO_PASS=${PASS}
+      - MONGO_HOST=unifi-db
+      - MONGO_PORT=27017
+      - MONGO_DBNAME=unifi
+      - MEM_LIMIT=1024 #optional
+      - MEM_STARTUP=1024 #optional
+      #- MONGO_TLS= #optional
+      #- MONGO_AUTHSOURCE= #optional
+    depends_on:
+      - unifi-db
+#        condition: service_healthy
+    volumes:
+      - ./config:/config
     ports:
+      - 8443:8443
       - 3478:3478/udp
       - 10001:10001/udp
       - 8080:8080
-      - 8443:8443
-    volumes:
-      - /opt/unifi/config:/config
-    restart: unless-stopped
+    #  - 1900:1900/udp #optional
+    #  - 8843:8843 #optional
+    #  - 8880:8880 #optional
+    #  - 6789:6789 #optional
+    #  - 5514:5514/udp #optional
+    restart: unless-stopped
+

unifi/init-mongo.js.sample

@@ -0,0 +1 @@
+db.getSiblingDB("unifi").createUser({user: "unifi", pwd: "ChangeMe", roles: [{role: "dbOwner", db: "unifi"}, {role: "dbOwner", db: "unifi_stat"}]});

uptime/README.md

@@ -0,0 +1,13 @@
+<h2>Uptime Kuma</H2>
+<p></p>
+<p></p>
+<img src="https://static-00.iconduck.com/assets.00/uptime-kuma-icon-1024x940-gabwl61r.png" alt="Uptime Kuma" width="200" />
+<p></p>
+<p></p>
+<p><b>Uptime Kuma</b> ist ein benutzerfreundliches, selbst gehostetes Überwachungstool.
+</p>
+<p></p>
+<img src="https://user-images.githubusercontent.com/1336778/212262296-e6205815-ad62-488c-83ec-a5b0d0689f7c.jpg" alt="Uptime Kuma" width="500" />
+<p></p>
+<a href="https://github.com/louislam/uptime-kuma" target="_blank">Uptime Kuma</a>
+<p></p>

uptime/docker-compose.yml

@@ -1,6 +1,3 @@
----
-version: '3.3'
-
 services:
   uptime-kuma:
     image: louislam/uptime-kuma:latest
@@ -9,4 +6,4 @@ services:
       - ./config:/app/data
     ports:
       - "8086:3001"
-    restart: unless-stopped
+    restart: unless-stopped

vdr/README.md

@@ -0,0 +1,218 @@
+<h2>VDR</H2>
+<p></p>
+<p></p>
+<img src="https://raw.githubusercontent.com/lapicidae/vdr-server/master/vdr-logo.svg" alt="VDR" width="200" />
+<p></p>
+<p></p>
+<p><b>VDR</b> ist ein kostenloses (Open Source), nichtkommerzielles Projekt von Klaus Schmidinger zur Erstellung eines digitalen Videorecorders unter Verwendung von Standard-PC-Komponenten. Es ist möglich, mit dem DVB-Standard kompatible digitale TV-Sendungen zu empfangen, aufzuzeichnen und wiederzugeben.
+</p>
+<p></p>
+<a href="https://adguard.com/de/adguard-home/overview.html/" target="_blank">VDR</a>
+<p></p>
+<h3>HowTo</h3>
+<hr>
+<p></p>
+<h3>Cine-Treiber manuell installieren, falls nicht automatisch erkannt.</h3>
+<pre>wget http://linuxsupport.digital-devices.eu/ddinfo.sh</code></pre>
+<pre>chmod u+x ddinfo.sh
+chown 744 ddinfo.sh</code></pre>
+<pre>wget http://linuxsupport.digital-devices.eu/dddvb_build.sh</code></pre>
+<pre>chmod u+x dddvb_build.sh
+chown 744 dddvb_build.sh</code></pre>
+<pre>wget http://linuxsupport.digital-devices.eu/dd_fw_update.sh</code></pre>
+<pre>chmod u+x dd_fw_update.sh
+chown 744 dd_fw_update.sh</code></pre>
+<pre>ddinfo.sh</code></pre>
+<pre>dddvb_build.sh</code></pre>
+<pre>dd_fw_update.sh</code></pre>
+<p></p>
+<h3>Schreibrechte f&uuml;r Aufnameverzeichniss hinzuf&uuml;gen</h3>
+<p></p>
+<pre>docker exec -it vdr-server /bin/bash</code></pre>
+<pre>chown 777 /usr/lib/vdr/bin/vdr-recordingaction</code></pre>
+<p></p>
+<h5>Setup.conf</h5>
+<p></p>
+<pre>AdaptiveSkipAlternate = 0
+AdaptiveSkipInitial = 120
+AdaptiveSkipPrevNext = 0
+AdaptiveSkipTimeout = 3
+AlwaysSortFoldersFirst = 1
+AntiAlias = 1
+AudioLanguages = 
+ChannelEntryTimeout = 1000
+ChannelInfoPos = 0
+ChannelInfoTime = 5
+ChannelsWrap = 0
+ColorKey0 = 0
+ColorKey1 = 1
+ColorKey2 = 2
+ColorKey3 = 3
+CurrentChannel = 1
+CurrentDolby = 0
+CurrentVolume = 255
+DefaultLifetime = 99
+DefaultPriority = 50
+DefaultSortModeRec = 1
+DelTimeshiftRec = 0
+DeviceBondings = 
+DiSEqC = 0
+DisplaySubtitles = 0
+EmergencyExit = 1
+EPGBugfixLevel = 3
+EPGLanguages = 
+EPGLinger = 0
+EPGScanTimeout = 5
+FoldersInTimerMenu = 1
+FontFix = Courier:Bold
+FontFixSize = 14
+FontFixSizeP = 0.030000
+FontOsd = Sans Serif:Bold
+FontOsdSize = 15
+FontOsdSizeP = 0.031000
+FontSml = Sans Serif
+FontSmlSize = 13
+FontSmlSizeP = 0.028000
+InitialChannel = S19.2E-1-1019-10301
+InitialVolume = -1
+InstantRecordTime = 180
+LnbFrequHi = 10600
+LnbFrequLo = 9750
+LnbSLOF = 11700
+MarginStart = 2
+MarginStop = 10
+MarkInstantRecord = 1
+MaxVideoFileSize = 1048570
+MenuKeyCloses = 0
+MenuScrollPage = 1
+MenuScrollWrap = 1
+MinEventTimeout = 30
+MinUserInactivity = 0
+MultiSpeedMode = 0
+NameInstantRecord = TITLE EPISODE
+NextWakeupTime = 0
+NumberKeysForChars = 1
+OSDAspect = 1.000000
+OSDHeight = 403
+OSDHeightP = 0.840000
+OSDLanguage = 
+OSDLeft = 58
+OSDLeftP = 0.080000
+OSDMessageTime = 1
+OSDSkin = sttng
+OSDTheme = dark
+OSDTop = 38
+OSDTopP = 0.080000
+OSDWidth = 624
+OSDWidthP = 0.870000
+PauseAtLastMark = 0
+PauseKeyHandling = 2
+PauseLifetime = 1
+PauseOnMarkJump = 1
+PauseOnMarkSet = 0
+PausePriority = 10
+PositionerLastLon = 0
+PositionerSpeed = 15
+PositionerSwing = 650
+PrimaryDVB = 1
+ProgressDisplayTime = 0
+RcRepeatDelay = 300
+RcRepeatDelta = 100
+RecordingDirs = 1
+RecordKeyHandling = 2
+RecSortingDirection = 0
+ResumeID = 0
+SetSystemTime = 0
+ShowChannelNamesWithSource = 0
+ShowInfoOnChSwitch = 1
+ShowRemainingTime = 0
+ShowReplayMode = 0
+SiteLat = 0
+SiteLon = 0
+SkipEdited = 0
+SkipSeconds = 60
+SkipSecondsRepeat = 60
+SplitEditedFiles = 0
+StandardCompliance = 0
+SubtitleBgTransparency = 0
+SubtitleFgTransparency = 0
+SubtitleLanguages = 
+SubtitleOffset = 0
+SVDRPDefaultHost = docker
+SVDRPHostName = docker
+SVDRPPeering = 1
+SVDRPTimeout = 300
+TimeoutRequChInfo = 1
+TimeSource = 
+TimeTransponder = 0
+UpdateChannels = 5
+UseDolbyDigital = 1
+UsePositioner = 0
+UseSmallFont = 1
+UseSubtitle = 1
+UseVps = 0
+VideoDisplayFormat = 1
+VideoFormat = 0
+VolumeLinearize = 0
+VolumeSteps = 51
+VpsMargin = 120
+ZapTimeout = 3
+epgsearch.UseSearchTimers = 1
+live.ChannelGroups = 1,2,3,4,5;6,7,8,9,10;11,12,13,14,15;16,17,18,19,20;21,22,23,24,25;26,27,28,29,30;31,32,33,34,35;36,37,38,39,40;41,42,43,44,45;46,47,48,49,50;51,52,53,54,55;56,57,58,59,60;61,62,63,64,65;66,67,68,69,70;71,72,73,74,75;76,77,78,79,80;81,82,83,84,85;86,87,88,89,90;91,92,93,94,95;96,97,98,99,100;101,102,103,104,105;106,107,108,109,110;111,112,113,114,115;116,117,118,119,120;121,122,123,124,125;126,127,128,129,130;131,132,133,134,135;136,137,138,139,140;141,142,143,144,145;146,147,148,149,150;151,152,153,154,155;156,157,158,159,160;161,162,163,164,165;166,167,168,169,170;171,172,173,174,175;176,177,178,179,180;181,182,183,184,185;186,187,188,189,190;191,192,193,194,195;196,197,198,199,200;201,202,203,204,205;206,207,208,209,210;211,212,213,214,215;216,217,218,219,220;221,222,223,224,225;226,227,228,229,230;231,232,233,234,235;236,237,238,239,240;241,242,243,244,245;246,247,248,249,250;251,252,253,254,255;256,257,258,259,260;261,262,263,264,265;266,267,268,269,270;271,272,273,274,275;276,277,278,279,280;281,282,283,284,285;286,287,288,289,290;291,292,293,294,295;296,297,298,299,300;301,302,303,304,305;306,307,308,309,310;311,312,313,314,315;316,317,318,319,320;321,322,323,324,325;326,327,328,329,330;
+live.LastChannel = 0
+live.LastSortingMode = dateasc
+live.LastWhatsOnListMode = list
+live.LocalNetMask = 192.168.0.0/16
+live.MarkNewRec = 1
+live.ScheduleDuration = 8
+live.ScreenShotInterval = 1000
+live.ShowChannelsWithoutEPG = 1
+live.ShowIMDb = 1
+live.ShowInfoBox = 0
+live.ShowLogo = 0
+live.StartPage = whatsonnow
+live.StreamdevPort = 3000
+live.StreamdevType = TS
+live.StreamVideoOpt0 = ffmpeg -loglevel warning -f mpegts -analyzeduration 1.2M -probesize 5M -i &lt;input&gt; -map 0:v -map 0:a:0 -c:v copy -c:a aac -ac 2
+live.StreamVideoOpt1 = ffmpeg -loglevel warning -f mpegts -analyzeduration 1.2M -probesize 5M -i &lt;input&gt; -map 0:v -map 0:a:0 -c:v libx264 -preset ultrafast -crf 23 -tune zerolatency -g 25 -r 25 -c:a aac -ac 2
+live.StreamVideoOpt2 = ffmpeg -loglevel warning -f mpegts -analyzeduration 1.2M -probesize 5M -i &lt;input&gt; -map 0:v -map 0:a:0 -c:v libx264 -preset ultrafast -crf 23 -tune zerolatency -g 25 -r 25 -c:a aac -ac 2
+live.StreamVideoOpt3 = ffmpeg -loglevel warning -f mpegts -analyzeduration 1.2M -probesize 5M -i &lt;input&gt; -map 0:v -map 0:a:0 -c:v libx264 -preset ultrafast -crf 23 -tune zerolatency -g 25 -r 25 -c:a aac -ac 2
+live.Theme = marine
+live.UseAjax = 1
+live.UseAuth = 0
+live.UserdefTimes = 20:15
+live.UseStreamdev = 1
+markad.DeferredShutdown = 0
+markad.Execution = 1
+markad.GenIndex = 1
+markad.HideMainMenuEntry = 1
+markad.IgnoreMargins = 0
+markad.Log2Rec = 0
+markad.LogoOnly = 1
+markad.OSDMessage = 0
+markad.SaveInfo = 1
+markad.SecondPass = 1
+markad.Verbose = 0
+markad.whileRecording = 1
+markad.whileReplaying = 1
+streamdev-server.AllowSuspend = 1
+streamdev-server.HideMenuEntry = 0
+streamdev-server.HTTPBindIP = 0.0.0.0
+streamdev-server.HTTPPriority = 0
+streamdev-server.HTTPServerPort = 3000
+streamdev-server.HTTPStreamType = 0
+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.LoopPrevention = 0
+streamdev-server.MaxClients = 12
+streamdev-server.ServerPort = 2004
+streamdev-server.StartHTTPServer = 1
+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</code></pre>

vdr/config/channels.conf

@@ -2,24 +2,24 @@
 Das Erste HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5101=27:5102=deu@3,5103=mis@3,5107=qks@3;5106=deu@106:5104;5105=deu:0:10301:1:1019:0
 ZDF HD;ZDFvision:11361:HC23M5O35P0S1:S19.2E:22000:6110=27:6120=deu@3,6121=mis@3,6123=mul@3;6122=deu@106:6130;6131=deu:0:11110:1:1011:0
 NDR FS SH HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5221=27:5222=deu@3,5223=mis@3,5227=qks@3;5226=deu@106:5224;5255=deu:0:10330:1:1025:0
-RTL HD;CBC:10832:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32;48=deu:1830,1843,1860,98C,9C4,186A,186D,98D,1842,4B64,4AF4:61200:1:1057:0
-SAT.1 HD;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:1830,1843,9C4,98C,1860,186A,98D,186D,1842,4B64,4AF4:61300:1:1017:0
-ProSieben HD;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:511=27:0;515=deu@106:33:1830,1843,9C4,98C,1860,186A,98D,186D,1842,4B64,4AF4:61301:1:1017:0
-RTLZWEI HD;CBC:10832:HC23M5O35P0S1:S19.2E:22000:1535=27:0;1539=deu@106:37;54=deu:1830,1843,1860,98C,9C4,186A,186D,98D,1842,4B64,4AF4:61205:1:1057:0
-VOX HD;CBC:10832:HC23M5O35P0S1:S19.2E:22000:511=27:0;515=deu@106:33;49=deu:1830,1843,1860,98C,9C4,186A,186D,98D,1842,4B64,4AF4:61201:1:1057:0
-kabel eins HD;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106:34:1830,1843,9C4,98C,1860,186A,98D,186D,1842,4B64,4AF4:61302:1:1017:0
-SUPER RTL HD;CBC:11082:HC34M5O20P0S1:S19.2E:22000:300=27:0;310=deu@106:320;330=deu:1830,1843,1860,9C4,98C,186A,186D,98D,1842,4B64,4AF4:11931:1:1041:0
-NITRO HD;CBC:11082:HC34M5O20P0S1:S19.2E:22000:500=27:0;510=deu@106:520;550=deu:1830,1843,1860,9C4,98C,186A,186D,98D,1842,4B64,4AF4:11951:1:1041:0
-SIXX HD;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:35:1830,1843,9C4,98C,1860,186A,98D,186D,1842,4B64,4AF4:61303:1:1017:0
+RTL HD;CBC:10832:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32;48=deu:1830,1843,1860,98C,9C4,186A,186D,98D,1842,4B64,4AF4,9F0:61200:1:1057:0
+SAT.1 HD;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:1830,1843,9C4,98C,1860,186A,98D,186D,1842,4B64,4AF4,9F0:61300:1:1017:0
+ProSieben HD;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:511=27:0;515=deu@106:33:1830,1843,9C4,98C,1860,186A,98D,186D,1842,4B64,4AF4,9F0:61301:1:1017:0
+RTLZWEI HD;CBC:10832:HC23M5O35P0S1:S19.2E:22000:1535=27:0;1539=deu@106:37;54=deu:1830,1843,1860,98C,9C4,186A,186D,98D,1842,4B64,4AF4,9F0:61205:1:1057:0
+VOX HD;CBC:10832:HC23M5O35P0S1:S19.2E:22000:511=27:0;515=deu@106:33;49=deu:1830,1843,1860,98C,9C4,186A,186D,98D,1842,4B64,4AF4,9F0:61201:1:1057:0
+kabel eins HD;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106:34:1830,1843,9C4,98C,1860,186A,98D,186D,1842,4B64,4AF4,9F0:61302:1:1017:0
+SUPER RTL HD;RTL:11082:HC34M5O20P0S1:S19.2E:22000:300=27:0;310=deu@106:320;330=deu:1830,1843,1860,9C4,98C,186A,186D,98D,1842,4B64,9F0,4AF4:11931:1:1041:0
+NITRO HD;RTL:11082:HC34M5O20P0S1:S19.2E:22000:500=27:0;510=deu@106:520;550=deu:1830,1843,1860,9C4,98C,186A,186D,98D,1842,4B64,4AF4,9F0:11951:1:1041:0
+SIXX HD;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:35:1830,1843,9C4,98C,1860,186A,98D,186D,1842,4B64,4AF4,9F0:61303:1:1017:0
 ANIXE HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:255=27:0;259=deu@106:0:0:21100:1:1053:0
-Pro7 MAXX HD;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106:36:1830,1843,9C4,98C,1860,186A,98D,186D,1842,4B64,4AF4:61304:1:1017:0
-SAT.1 Gold HD;ProSiebenSat.1:11111:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:1830,1860,1843,98C,9C4,186A,98D,186D,1842,4B64,4AF4:12500:1:1043:0
+Pro7 MAXX HD;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106:36:1830,1843,9C4,98C,1860,186A,98D,186D,1842,4B64,4AF4,9F0:61304:1:1017:0
+SAT.1 Gold HD;ProSiebenSat.1:11111:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:1830,1860,1843,98C,9C4,186A,98D,186D,1842,4B64,4AF4,9F0:12500:1:1043:0
 ATV HD;ATV:11243:HC56M2S0:S19.2E:22000:2280=27:2281=deu@3:2285:648,650,D95,D98,500,6E2,98D,9C4,98C:13228:1:1003:0
 :->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
-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
+WELT HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:767=27:0;771=deu@106:0;37=deu: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,9F0: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
 Disney Channel HD;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:1830,1843,9C4,98C,1860,186A,98D,186D,500,1842,4B64,4AF4:5500:1:1055:0
@@ -27,16 +27,16 @@ Disney Channel HD;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:255=27:0;259=deu@
 SPORT1 HD;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:1535=27:0;1539=deu@106:37:1830,1843,9C4,98C,1860,186A,500,98D,186D,1842,4B64,4AF4:5505:1:1055:0
 :-> Musik
 Deluxe Music HD;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:0:1830,1843,9C4,98C,1860,186A,98D,186D,500,1842,4B64,4AF4:5503:1:1055:0
-MTV HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:0:1830,1843,1860,186A,9C4,98C,186D,98D,1842,4B64,4AF4:10103:1:1033:0
+MTV HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:0:1830,1843,1860,186A,9C4,98C,186D,98D,1842,4B64,4AF4,9F0:10103:1:1033:0
 :-> Dritte Programme
 3sat HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6510=27:6520=deu@3,6521=mis@3,6523=mul@3;6522=deu@106:6530;6531=deu:0:11150:1:1010:0
-arte HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5111=27:5112=deu@3,5113=fra@3,5116=mul@3,5117=mis@3:5114;5115=deu,5118=fra,5119=deu:0:10302:1:1019:0
+arte HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5111=27:5112=deu@3,5113=fra@3,5116=mul@3,5117=mis@3:5114;5115=deu,5118=fra,5119=deu,5198=dan:0:10302:1:1019:0
 ZDFinfo HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6710=27:6720=deu@3,6721=mis@3,6723=mul@3;6722=deu@106:6730;6731=deu:0:11170:1:1010:0
 zdf_neo HD;ZDFvision:11361:HC23M5O35P0S1:S19.2E:22000:6310=27:6320=deu@3,6321=mis@3,6323=mul@3;6322=deu@106:6330;6331=deu:0:11130:1:1011:0
 BR Fernsehen Nord HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5201=27:5202=deu@3,5203=mis@3,5207=qks@3;5206=deu@106:5204;5205=deu:0:10326:1:1025:0
 BR Fernsehen Süd HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5201=27:5202=deu@3,5203=mis@3,5207=qks@3;5206=deu@106:5204;5205=deu:0:10325:1:1025:0
-SWR RP HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5121=27:5122=deu@3,5123=mis@3;5126=deu@106:5134;5135=deu:0:10304:1:1019:0
-SWR BW HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5121=27:5122=deu@3,5123=mis@3;5126=deu@106:5124;5125=deu:0:10303:1:1019:0
+SWR RP HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5121=27:5122=deu@3,5123=mis@3,5127=qks@3;5126=deu@106:5134;5135=deu:0:10304:1:1019:0
+SWR BW HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5121=27:5122=deu@3,5123=mis@3,5127=qks@3;5126=deu@106:5124;5125=deu:0:10303:1:1019:0
 WDR HD Köln;ARD:12421:HC34M2S0:S19.2E:27500:5501=27:5502=deu@3,5503=mis@3;5506=deu@106:5504;5505=deu:0:28325:1:1201:0
 ARD-alpha;ARD:12265:HC34M2S0:S19.2E:27500:1401=2:1402=deu@3,1403=mis@3;1406=deu@106:1404;1405=deu:0:28487:1:1093:0
 hr-fernsehen HD;ARD:10891:HC23M5O35P0S1:S19.2E:22000:5351=27:5352=deu@3,5353=mis@3,5357=qks@3;5356=deu@106:5354;5355=deu:0:10355:1:1061:0
@@ -45,9 +45,9 @@ 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:5331=27:5332=deu@3,5333=mis@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;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;5336=deu@106:5334;5335=deu:0:10354: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
 SWR Fernsehen BW;ARD:11836:HC34M2S0:S19.2E:27500:801=2:802=deu@3,803=mis@3;806=deu@106:804:0:28113:1:1101:0
 SWR Fernsehen RP;ARD:12109:HC34M2S0:S19.2E:27500:3101=2:3102=deu@3,3103=mis@3;3106=deu@106:3104:0:28231:1:1073:0
@@ -64,40 +64,40 @@ WDR Siegen;ARD:12421:HC34M2S0:S19.2E:27500:501=2:502=deu@3,503=mis@3:504;505=deu
 WDR Wuppertal;ARD:12603:HC56M2S0:S19.2E:22000:3401=2:3402=deu@3,3403=mis@3:3804;3405=deu:0:28535:1:1111:0
 :-> Verkaufs-TV
 QVC HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:1023=27:0;1027=deu@106:35:0:21103:1:1053:0
-QVC ZWEI HD;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106:36:0:5504:1:1055:0
-QVC STYLE HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:1535=27:0;1539=deu@106:37:0:10105:1:1033:0
+QVC ZWEI HD;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106:0:0:5504:1:1055:0
+QVC STYLE HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:1535=27:0;1539=deu@106:0:0:10105:1:1033:0
 HSE HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:1279=27:0;1283=deu@106:36:0:21104:1:1053:0
 HSE Extra HD;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:511=27:0;515=deu@106:33:0:5501:1:1055:0
 1-2-3.tv HD;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106:34:0:5502:1:1055:0
 :->sonstige
-RTLup HD;CBC:10832:HC23M5O35P0S1:S19.2E:22000:1791=27:0;1795=deu@106:38:1830,1843,1860,98C,9C4,186A,186D,98D,1842,4B64,4AF4:61206:1:1057:0
-VOXup HD;CBC:10832:HC23M5O35P0S1:S19.2E:22000:2047=27:0;2051=deu@106:39:1830,1843,1860,98C,9C4,186A,186D,98D,1842,4B64,4AF4:61207:1:1057:0
-UHD1 by ASTRA / HD+;SES ASTRA:10993:HC56M5O35P0S1:S19.2E:22000:101=36:0;102=deu@122:0:0:2:1:1035:0
-Pro7Sat.1 UHD;ProSiebenSat.1:10993:HC56M5O35P0S1:S19.2E:22000:767=36:0;771=deu@122:0:186D,1842,4B64,1830,1843,1860,186A,4AF4,9C4,98C,98D:6205:1:1035:0
+RTLup HD;CBC:10832:HC23M5O35P0S1:S19.2E:22000:1791=27:0;1795=deu@106:38:1830,1843,1860,98C,9C4,186A,186D,98D,1842,4B64,4AF4,9F0:61206:1:1057:0
+VOXup HD;CBC:10832:HC23M5O35P0S1:S19.2E:22000:2047=27:0;2051=deu@106:39:1830,1843,1860,98C,9C4,186A,186D,98D,1842,4B64,4AF4,9F0:61207:1:1057:0
+UHD1 by ASTRA / HD+;SES ASTRA:10993:HC56M5O35P0S1:S19.2E:22000:101=36:0;102=deu@106:0:0:2:1:1035:0
+Pro7Sat.1 UHD;ProSiebenSat.1:10993:HC56M5O35P0S1:S19.2E:22000:767=36:0;771=deu@122:0:186D,1842,4B64,1830,1843,1860,186A,4AF4,9C4,98C,98D,9F0:6205:1:1035:0
 SES UHD Demo Channel 06;SES:10993:HC56M5O35P0S1:S19.2E:22000:511=36:0;512=deu@122:0:0:7:1:1035:0
 SES UHD Demo Channel 05;SES:10993:HC56M5O35P0S1:S19.2E:22000:511=36:0;512=deu@122:0:0:6:1:1035:0
 SES UHD Demo Channel 04;SES:10993:HC56M5O35P0S1:S19.2E:22000:511=36:0;512=deu@122:0:0:5:1:1035:0
 SES UHD Demo Channel 03;SES:10993:HC56M5O35P0S1:S19.2E:22000:511=36:0;512=deu@122:0:0:4:1:1035:0
 SES UHD Demo Channel 02;SES:10993:HC56M5O35P0S1:S19.2E:22000:511=36:0;512=deu@122:0:0:3:1:1035:0
-TLC HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:1830,1843,9C4,98C,1860,186A,186D,98D,1842,4B64,4AF4:10100:1:1033:0
-BILD HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:511=27:0;515=deu@106:0:0:10101:1:1033:0
-Channel21 HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106:0:0:10104:1:1033:0
+TLC HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:1830,1843,9C4,98C,1860,186A,186D,98D,1842,4B64,4AF4,9F0:10100:1:1033:0
+1-2-3.tv HD2;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:511=27:0;515=deu@106:34:0:10101:1:1033:0
+Channel21 HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106:33:0:10104:1:1033:0
 tagesschau24 HD;ARD:11052:HC23M5O35P0S1:S19.2E:22000:5401=27:5402=deu@3,5403=mis@3,5407=qks@3;5406=deu@106:5404:0:10375:1:1039:0
 ONE HD;ARD:11052:HC23M5O35P0S1:S19.2E:22000:5411=27:5412=deu@3,5413=mis@3,5417=qks@3;5416=deu@106:5414;5415=deu:0:10376:1:1039:0
-ARD alpha HD;ARD:11052:HC23M5O35P0S1:S19.2E:22000:5421=27:5422=deu@3,5423=mis@3;5426=deu@106:5424;5425=deu:0:10377:1:1039:0
-SR Fernsehen HD;ARD:11052:HC23M5O35P0S1:S19.2E:22000:5431=27:5432=deu@3,5433=mis@3;5436=deu@106:5434;5435=deu:0:10378:1:1039:0
+ARD alpha HD;ARD:11052:HC23M5O35P0S1:S19.2E:22000:5421=27:5422=deu@3,5423=mis@3,5427=qks@3;5426=deu@106:5424;5425=deu:0:10377:1:1039:0
+SR Fernsehen HD;ARD:11052:HC23M5O35P0S1:S19.2E:22000:5431=27:5432=deu@3,5433=mis@3,5437=qks@3;5436=deu@106:5434;5435=deu:0:10378:1:1039:0
 Radio Bremen HD;ARD:11052:HC23M5O35P0S1:S19.2E:22000:5441=27:5442=deu@3,5443=mis@3,5447=qks@3:5444;5445=deu:0:10379:1:1039:0
-ServusTV HD Deutschland;ServusTV:11302:HC23M5O35P0S1:S19.2E:22000:4920=27:4921=deu@4,4922=eng@4;4924=deu@106:4925:0:4914:1:1007:0
+DF1 HD;DF1 Medien:11302:HC23M5O35P0S1:S19.2E:22000:4920=27:4921=deu@3:0:0:4914:1:1007:0
 RTL UHD;MX1:11391:HC56M2S0:S19.2E:22000:2815=36:0;2816=deu@122:42:1830,1843,1860,186A,186D,9C4,98C,98D,1842,4B64,4AF4,500:12410:1:1013:0
-PULS 24 HD;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106:0:9C4,98C,98D,500,648,650,D95,D98,6E2:5304:1:1031:0
+PULS 24 HD;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106:36:9C4,98C,98D,500,648,650,D95,D98,6E2,9F0:5304:1:1031:0
 SAT.1 emotions;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:3583=27:3584=deu@3:0:D95,648,D98,650,624,500:5313:1:1031:0
 kabel eins classics;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:3839=27:3840=deu@3:0:D95,648,D98,650,624,500:5314:1:1031:0
 4mediathek;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:1535+8191=27:0:0:0:5305:1:1031:0
 :-> neue Sender
-Disney Channel HD Austria;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:9C4,98C,648,650,500,98D,6E2:5510:1:1055:0
-Deluxe Music HD Austria;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:0:9C4,98C,648,650,500,6E2,98D:5513:1:1055:0
+Disney Channel HD Austria;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:9C4,98C,648,650,500,98D,6E2,9F0:5510:1:1055:0
+Deluxe Music HD Austria;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:0:9C4,98C,648,650,500,6E2,98D,9F0:5513:1:1055:0
 .;BetaDigital:10920:HC78M2S0:S19.2E:22000:0:0:0:0:56:133:15:0
-.;BetaDigital:10920:HC78M2S0:S19.2E:22000:1279=27:1280=deu@3:0:0:39:133:15:0
+.;BetaDigital:10920:HC78M2S0:S19.2E:22000:1279=27:1280=deu@4:0:0:39:133:15:0
 Schlager Deluxe;BetaDigital:10920:HC78M2S0:S19.2E:22000:511=2:512=deu@3:0:0:35:133:15:0
 Genius family;BetaDigital:10920:HC78M2S0:S19.2E:22000:255=27:256=deu@4:0:0:33:133:15:0
 HGTV;BetaDigital:10920:HC78M2S0:S19.2E:22000:1023=2:1024=deu@3:0:0:38:133:15:0
@@ -121,14 +121,14 @@ MDR SPUTNIK;ARD MDR:10891:HC23M5O35P0S1:S19.2E:22000:0:851=deu@17:0:0:10479:1:10
 MDR AKTUELL;ARD MDR:10891:HC23M5O35P0S1:S19.2E:22000:0:861=deu@17:0:0:10480:1:1061:0
 MDR KLASSIK;ARD MDR:10891:HC23M5O35P0S1:S19.2E:22000:0:871=deu@17:0:0:10481:1:1061:0
 rbb24 Inforadio;ARD rbb:10891:HC23M5O35P0S1:S19.2E:22000:0:901=deu@17:0:0:10484:1:1061:0
-rbbKultur;ARD rbb:10891:HC23M5O35P0S1:S19.2E:22000:0:911=deu@17:0:0:10485:1:1061:0
+radio3;ARD rbb:10891:HC23M5O35P0S1:S19.2E:22000:0:911=deu@17:0:0:10485:1:1061:0
 Antenne Brbg.;ARD rbb:10891:HC23M5O35P0S1:S19.2E:22000:0:921=deu@17:0:0:10486:1:1061:0
 rbb 88.8;ARD rbb:10891:HC23M5O35P0S1:S19.2E:22000:0:931=deu@17:0:0:10487:1:1061:0
 radioeins;ARD rbb:10891:HC23M5O35P0S1:S19.2E:22000:0:941=deu@17:0:0:10488:1:1061:0
 Fritz;ARD rbb:10891:HC23M5O35P0S1:S19.2E:22000:0:951=deu@17:0:0:10489:1:1061:0
 Handystar TV HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106:0:0:10102:1:1033:0
 TLC HD Austria;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:6E2:10110:1:1033:0
-MTV HD Austria;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:0:648,650,9C4,98C,500,6E2,98D:10113:1:1033:0
+MTV HD Austria;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:0:648,650,9C4,98C,500,6E2,98D,9F0:10113:1:1033:0
 SES UHD Demo Channel;SES:10993:HC56M5O35P0S1:S19.2E:22000:511=36:0;512=deu@122:0:0:1:1:1035:0
 Bayern 1;ARD BR:11052:HC23M5O35P0S1:S19.2E:22000:0:101=deu@17:0:0:10400:1:1039:0
 Bayern 2;ARD BR:11052:HC23M5O35P0S1:S19.2E:22000:0:111=deu@17:0:0:10401:1:1039:0
@@ -159,17 +159,17 @@ SR 2 KulturRadio;ARD SR:11052:HC23M5O35P0S1:S19.2E:22000:0:411=deu@17:0:0:10433:
 SR 3 Saarlandwelle;ARD SR:11052:HC23M5O35P0S1:S19.2E:22000:0:421=deu@17:0:0:10434:1:1039:0
 SWR1 BW;ARD SWR:11052:HC23M5O35P0S1:S19.2E:22000:0:501=deu@17:0:0:10440:1:1039:0
 SWR1 RP;ARD SWR:11052:HC23M5O35P0S1:S19.2E:22000:0:511=deu@17:0:0:10441:1:1039:0
-SWR2;ARD SWR:11052:HC23M5O35P0S1:S19.2E:22000:0:521=deu@17:0:0:10442:1:1039:0
+SWR Kultur;ARD SWR:11052:HC23M5O35P0S1:S19.2E:22000:0:521=deu@17:0:0:10442:1:1039:0
 SWR3;ARD SWR:11052:HC23M5O35P0S1:S19.2E:22000:0:531=deu@17:0:0:10443:1:1039:0
 SWR4 BW;ARD SWR:11052:HC23M5O35P0S1:S19.2E:22000:0:541=deu@17:0:0:10444:1:1039:0
 SWR4 RP;ARD SWR:11052:HC23M5O35P0S1:S19.2E:22000:0:551=deu@17:0:0:10445:1:1039:0
 DASDING;ARD SWR:11052:HC23M5O35P0S1:S19.2E:22000:0:561=deu@17:0:0:10446:1:1039:0
 SWR Aktuell;ARD SWR:11052:HC23M5O35P0S1:S19.2E:22000:0:571=deu@17:0:0:10447:1:1039:0
 1LIVE;ARD WDR:11052:HC23M5O35P0S1:S19.2E:22000:0:601=deu@17:0:0:10451:1:1039:0
-WDR 2 Rheinland;ARD WDR:11052:HC23M5O35P0S1:S19.2E:22000:0:611=deu@17:0:0:10452:1:1039:0
-RTL HD Austria;CBC:11082:HC34M5O20P0S1:S19.2E:22000:100=27:0;110=deu@106:120:648,9C4,98C,650,500,6E2,98D:11911:1:1041:0
-VOX HD Austria;CBC:11082:HC34M5O20P0S1:S19.2E:22000:200=27:0;210=deu@106:220:648,9C4,98C,650,500,6E2,98D:11921:1:1041:0
-RTLZWEI HD Austria;CBC:11082:HC34M5O20P0S1:S19.2E:22000:400=27:0;410=deu@106:420:648,9C4,98C,650,500,6E2,98D:11941:1:1041:0
+WDR 2;ARD WDR:11052:HC23M5O35P0S1:S19.2E:22000:0:611=deu@17:0:0:10452:1:1039:0
+RTL HD Austria;RTL:11082:HC34M5O20P0S1:S19.2E:22000:100=27:0;110=deu@106:120:648,9C4,98C,650,500,6E2,98D,9F0:11911:1:1041:0
+VOX HD Austria;RTL:11082:HC34M5O20P0S1:S19.2E:22000:200=27:0;210=deu@106:220:648,9C4,98C,650,500,6E2,98D,9F0:11921:1:1041:0
+RTLZWEI HD Austria;RTL:11082:HC34M5O20P0S1:S19.2E:22000:400=27:0;410=deu@106:420:648,9C4,98C,650,500,6E2,98D,9F0:11941:1:1041:0
 WDR 3;ARD WDR:11052:HC23M5O35P0S1:S19.2E:22000:0:621=deu@17:0:0:10453:1:1039:0
 WDR 4;ARD WDR:11052:HC23M5O35P0S1:S19.2E:22000:0:631=deu@17:0:0:10454:1:1039:0
 WDR 5;ARD WDR:11052:HC23M5O35P0S1:S19.2E:22000:0:641=deu@17:0:0:10455:1:1039:0
@@ -178,27 +178,27 @@ 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:0: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,9F0: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
+SAT.1 Gold HD Austria;ProSiebenSat.1:11111:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:9C4,98C,500,6E2,98D,9F0:12520:1:1043:0
 Eurosport 1 HD Austria;SES ASTRA:11111:HC23M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106:0:6E2:12522:1:1043:0
-Sky Cinema Action HD,Sky Action HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106,772=eng@106:0:9C4,98C,98D:116:133:9:0
+Sky Cinema Action,Sky Action;SKY:11170:HC34M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106,772=eng@106:0:98D,98C,9C4,9F0:116:133:9:0
 Sky Sport Austria 1 HD OBSOLETE,Sky Austria 1 HD;OBSOLETE SKY:11170:HC34M5O35P0S1:S19.2E:22000:1023=27:0;1027=qae@106:0;33=deu:9C4,98C,98D:143:133:9:0
-Universal TV HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:1535=27:0;1539=deu@106,1540=eng@106:0:9C4,98C,98D:101:133:9:0
-Warner TV Serie HD,Warner TV Serie HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106,1284=eng@106:0:9C4,98C,98D:123:133:9:0
-DAZN 1 HD,DAZN1HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:1791=27:0;1795=deu@106:0:98C,9C4,98D:132:133:9:0
-Sky Sport Bundesliga 4 HD,Sky Buli 4 HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:2815=27:0;2818=qab@106,2820=qac@106:32:98C,9C4,98D:297:133:9:0
-Sky Sport 4 HD,Sky Sport 4 HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:2559=27:0;2562=qae@106,2564=qaf@106:32:98C,9C4,98D:298:133:9:0
+Universal TV HD OBSOLETE;OBSOLETE SKY:11170:HC34M5O35P0S1:S19.2E:22000:1535=27:0;1539=deu@106,1540=eng@106:0:98C,9C4,98D:101:133:9:0
+Warner TV Serie HD OBSOLETE,Warner TV Serie HD;OBSOLETE SKY:11170:HC34M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106,1284=eng@106:0:98C,98D,9C4:123:133:9:0
+DAZN 1,DAZN1;SKY:11170:HC34M5O35P0S1:S19.2E:22000:2559=27:0;2563=deu@106:0:9F0,98D,98C,9C4:132:133:9:0
+Sky Sport Bundesliga 4 HD OBSOLETE,Sky Buli 4 HD;OBSOLETE SKY:11170:HC34M5O35P0S1:S19.2E:22000:2815=27:0;2818=qab@106,2820=qac@106:32:98C,98D,9C4:297:133:9:0
+Sky Sport 4 HD OBSOLETE,Sky Sport 4 HD;OBSOLETE SKY:11170:HC34M5O35P0S1:S19.2E:22000:2559=27:0;2562=qae@106,2564=qaf@106:32:9C4,98D,98C:298:133:9:0
 Eurosport360HD 4 OBSOLETE,Eurosp360 4;OBSOLETE SKY:11170:HC34M5O35P0S1:S19.2E:22000:0:0:0:0:300:133:9:0
 Sky Sport Austria 3 HD OBSOLETE,Sky Austria 3 HD;OBSOLETE SKY:11170:HC34M5O35P0S1:S19.2E:22000:511=27:0;514=qae@106,516=qaf@106:0:9C4,98C,98D:339:133:9:0
-Prime Video Sportsbar OBSOLETE,Prime Video;OBSOLETE SKY:11170:HC34M5O35P0S1:S19.2E:22000:3327=27:0;3331=deu@106:0:98C,98D,9C4:341:133:9:0
-ORF SPORT+;ORF:11243:HC56M2S0:S19.2E:22000:2210=2:2211=deu@3,2212=mis@3:2215:648,650,D95,D98:13221:1:1003:0
-StarParadies D;-:11243:HC56M2S0:S19.2E:22000:2220=2:2221=@3:0:0:13222:1:1003:0
-ATV2;ATV:11243:HC56M2S0:S19.2E:22000:2230=2:2231=deu@3:2235:648,650,D95,D98,500,6E2,9C4,98C,98D:13223:1:1003:0
+Prime Video Sportsbar,Prime Video;SKY:11170:HC34M5O35P0S1:S19.2E:22000:3583=27:0;3587=deu@106:0:9C4,98C,98D,9F0:341:133:9:0
+ORF SPORT+;ORF:11243:HC56M2S0:S19.2E:22000:2210=2:0:0:648,650,D95,D98:13221:1:1003:0
+Volksmusik.TV NEU:11243:HC56M2S0:S19.2E:22000:2220=27:2221=@3:2225:0:13222:1:1003:0
+ATV2 HD;ATV:11243:HC56M2S0:S19.2E:22000:2230=27:2231=deu@3:2235:648,650,D95,D98,500,6E2,9C4,98C,98D:13223:1:1003:0
 Bibel TV HD;ORS:11243:HC56M2S0:S19.2E:22000:2240=27:2241=deu@3:2245:0:13224:1:1003:0
-Schau TV HD;-:11243:HC56M2S0:S19.2E:22000:2250=27:2251=deu@3:0:0:13225:1:1003:0
-StarParadies AT;-:11243:HC56M2S0:S19.2E:22000:2220=2:2221=deu@3:0:0:13226:1:1003:0
+KURIER TV:11243:HC56M2S0:S19.2E:22000:2250=27:2251=deu@3:2255:0:13225:1:1003:0
+Service 13226;-:11243:HC56M2S0:S19.2E:22000:0:0:0:0:13226:1:1003:0
 Hope TV;-:11243:HC56M2S0:S19.2E:22000:2270=27:2271=deu@3:0:0:13227:1:1003:0
 RTLup Austria;RTL:11243:HC56M2S0:S19.2E:22000:2290=27:2291=deu@3:2295:0:13229:1:1003:0
 Service 13232;ORS:11243:HC56M2S0:S19.2E:22000:0:0:0:0:13232:1:1003:0
@@ -206,10 +206,10 @@ Service 13233;ORS:11243:HC56M2S0:S19.2E:22000:0:0:0:0:13233:1:1003:0
 Service 13401;ORS:11214:HC34M5O20P0S1:S19.2E:23500:4010=36:0:0:6E2:13401:1:1001:0
 Service13405;ORS:11214:HC34M5O20P0S1:S19.2E:23500:0:0:0:0:13405:1:1001:0
 RTL UHD Austria;ORS:11214:HC34M5O20P0S1:S19.2E:23500:4110=36:0;4111=deu@122:4115:6E2:13410:1:1001:0
-Service13412;ORF:11214:HC34M5O20P0S1:S19.2E:23500:0:0:0:0:13412:1:1001:0
+Service 13412;ORF:11214:HC34M5O20P0S1:S19.2E:23500:0:0:0:0:13412:1:1001:0
 ORF1 HD;ORF:11302:HC23M5O35P0S1:S19.2E:22000:1920=27:0;1921=deu@106,1922=mis@106:1925:648,650,D95,D98,6E2,500,98D,9C4,98C:4911:1:1007:0
 ORF2W HD;ORF:11302:HC23M5O35P0S1:S19.2E:22000:2920=27:0;2921=deu@106,2922=mis@106:2925:648,650,D95,D98,6E2,500,98D,9C4,98C:4912:1:1007:0
-ServusTV HD Oesterreich;ServusTV:11302:HC23M5O35P0S1:S19.2E:22000:3583=27:3584=deu@4,3585=eng@4;3587=deu@106:3588:648,650,D95,D98,9C4,98C,6E2,500,98D:4913:1:1007:0
+ServusTV HD Oesterreich;ServusTV:11302:HC23M5O35P0S1:S19.2E:22000:3583=27:3584=deu@4,3585=mis@4;3587=deu@106:3588:648,650,D95,D98,9C4,98C,6E2,500,98D:4913:1:1007:0
 ORF2N HD;ORF:11302:HC23M5O35P0S1:S19.2E:22000:2920=27:0;2921=deu@106,2922=mis@106:2925:648,650,D95,D98,6E2,500,98D,9C4,98C:4916:1:1007:0
 OE3.;ORF:11302:HC23M5O35P0S1:S19.2E:22000:0:921=deu@3:0:0:4920:1:1007:0
 ORF2St HD;ORF:11273:HC23M5O35P0S1:S19.2E:22000:3000=27:0;3001=deu@106,3002=mis@106:3005:D98,650,D95,648,6E2,98C,9C4,98D,500:13301:1:1005:0
@@ -221,14 +221,14 @@ ORF2T HD;ORF:11273:HC23M5O35P0S1:S19.2E:22000:3000=27:0;3001=deu@106,3002=mis@10
 ORF2V HD;ORF:11273:HC23M5O35P0S1:S19.2E:22000:3000=27:0;3001=deu@106,3002=mis@106:3005:D98,650,D95,648,6E2,98C,9C4,98D,500:13307:1:1005:0
 ORF III HD;ORF:11273:HC23M5O35P0S1:S19.2E:22000:3080=27:0;3081=deu@106,3082=mis@106:3085:D98,650,D95,648,6E2,98C,9C4,98D,500:13308:1:1005:0
 ORF SPORT+ HD;ORF:11273:HC23M5O35P0S1:S19.2E:22000:3090=27:0;3091=deu@106,3092=mis@106:3095:D98,650,D95,648,6E2,98C,9C4,98D,500:13309:1:1005:0
-Flimmit;ORF:11273:HC23M5O35P0S1:S19.2E:22000:3100+8191=27:0:0:0:13310:1:1005:0
-Aristo.TV;ORF:11273:HC23M5O35P0S1:S19.2E:22000:3110=27:3111=deu@4:0:0:13311:1:1005:0
-R9 Oesterreich HD;-:11273:HC23M5O35P0S1:S19.2E:22000:3120=27:3121=deu@3:0:0:13312:1:1005:0
-krone.tv;-:11273:HC23M5O35P0S1:S19.2E:22000:3130=27:3131=deu@3:0:0:13313:1:1005:0
-oe24.TV HD;-:11273:HC23M5O35P0S1:S19.2E:22000:3140=27:3141=deu@3:0:0:13314:1:1005:0
-volksmusik;ORS:11273:HC23M5O35P0S1:S19.2E:22000:3150=27:3151=@4:0:0:13315:1:1005:0
+Service 13310;ORF:11273:HC23M5O35P0S1:S19.2E:22000:0:0:0:0:13310:1:1005:0
+meinTVshop;ORF:11273:HC23M5O35P0S1:S19.2E:22000:3110=27:3111=deu@4:0:0:13311:1:1005:0
+R9 Oesterreich HD;ORS:11273:HC23M5O35P0S1:S19.2E:22000:3120=27:3121=deu@3:0:0:13312:1:1005:0
+krone.tv:11273:HC23M5O35P0S1:S19.2E:22000:3130=27:3131=deu@3:3135:0:13313:1:1005:0
+oe24.TV HD;-:11273:HC23M5O35P0S1:S19.2E:22000:3140=27:3141=deu@3:0:D98,650,D95,648,6E2,98C,9C4,98D,500:13314:1:1005:0
+TV1 OOE;ORS:11273:HC23M5O35P0S1:S19.2E:22000:3150=27:3151=deu@4:0:0:13315:1:1005:0
 Stimmungsgarten TV;ORS:11273:HC23M5O35P0S1:S19.2E:22000:3160=27:3161=deu@3:0:0:13316:1:1005:0
-Melodie TV NEU;-:11273:HC23M5O35P0S1:S19.2E:22000:3170=27:3171=deu@3:0:0:13317:1:1005:0
+Melodie TV NEU;MTI:11273:HC23M5O35P0S1:S19.2E:22000:3170=27:3171=deu@3:0:0:13317:1:1005:0
 .;BetaDigital:11391:HC56M2S0:S19.2E:22000:0:0:0:0:12400:1:1013:0
 SES 01;BetaDigital:11420:HC56M2S0:S19.2E:22000:0:0:0:0:4700:1:1015:0
 SES 02;BetaDigital:11420:HC56M2S0:S19.2E:22000:0:0:0:0:4701:1:1015:0
@@ -243,18 +243,18 @@ SES 10;BetaDigital:11420:HC56M2S0:S19.2E:22000:0:0:0:0:4709:1:1015:0
 .;BetaDigital:11420:HC56M2S0:S19.2E:22000:0:0:0:0:4710:1:1015:0
 .;BetaDigital:11420:HC56M2S0:S19.2E:22000:0:0:0:0:4711:1:1015:0
 .;BetaDigital:11420:HC56M2S0:S19.2E:22000:0:0:0:0:4712:1:1015:0
-Die Neue Zeit TV;BetaDigital:11420:HC56M2S0:S19.2E:22000:3583=27:3584=deu@4:0:0:4713:1:1015:0
+.;BetaDigital:11420:HC56M2S0:S19.2E:22000:3583=27:3584=deu@4:0:0:4713:1:1015:0
 .;BetaDigital:11420:HC56M2S0:S19.2E:22000:0:0:0:0:4714:1:1015:0
 .;BetaDigital:11420:HC56M2S0:S19.2E:22000:0:0:0:0:4715:1:1015:0
 .;BetaDigital:11420:HC56M2S0:S19.2E:22000:0:0:0:0:4716:1:1015:0
 .;BetaDigital:11420:HC56M2S0:S19.2E:22000:0:0:0:0:4717:1:1015:0
-.1.;BetaDigital:11420:HC56M2S0:S19.2E:22000:5119=2:5120=deu@3:0:1830,1843,1860,186A,186D,1887,1842,4B64,6E2,4AF4:4718:1:1015:0
+.1.;BetaDigital:11420:HC56M2S0:S19.2E:22000:5119=2:5120=deu@3:0:1830,1843,1860,186A,186D,1887,1842,4B64,6E2,4AF4,1837,9F0:4718:1:1015:0
 .2.;BetaDigital:11420:HC56M2S0:S19.2E:22000:5375=2:5376=deu@3:0:1830,1860,1843,9C4,98C,1867,186A,186D,4B64,1842,4AF4:4719:1:1015:0
-.3.;BetaDigital:11420:HC56M2S0:S19.2E:22000:5631=2:5632=deu@3:0:1867,1887,1842,4B64:4720:1:1015:0
-kabel eins HD Austria;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106:34:9C4,98C,648,650,500,6E2,98D:61322:1:1017:0
-sixx HD Austria;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:35:9C4,98C,500,6E2,98D:61323:1:1017:0
-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
+.3.;BetaDigital:11420:HC56M2S0:S19.2E:22000:5631=2:5632=deu@3:0:0:4720:1:1015:0
+kabel eins HD Austria;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106:34:9C4,98C,648,650,500,6E2,98D,9F0:61322:1:1017:0
+sixx HD Austria;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:35:9C4,98C,500,6E2,98D,9F0:61323:1:1017:0
+Pro7 MAXX HD Austria;ProSiebenSat.1:11464:HC23M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106:36:9C4,98C,500,6E2,98D,9F0: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,9F0: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 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
@@ -277,10 +277,10 @@ Lokal-TV-Portal HD;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1001=27:0:0:0:5805:1:102
 NIEDERBAYERN TV HD;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1080=27:1082=deu@3:0:0:5807:1:1023:0
 OTVA HD;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1090=27:1092=deu@3:0:0:5808:1:1023:0
 Franken Plus HD;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1100=27:1102=deu@3:0:0:5809:1:1023:0
-SAT.1 HD Austria;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:9C4,98C,648,650,500,6E2,98D:5300:1:1031:0
-ProSieben HD Austria;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:511=27:0;515=deu@106:33:9C4,98C,648,650,500,6E2,98D:5301:1:1031:0
+SAT.1 HD Austria;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:9C4,98C,648,650,500,6E2,98D,9F0:5300:1:1031:0
+ProSieben HD Austria;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:511=27:0;515=deu@106:33:9C4,98C,648,650,500,6E2,98D,9F0:5301:1:1031:0
 .;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:0:0:0:0:5302:1:1031:0
-PULS 4 HD Austria;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:35:9C4,98C,648,650,500,6E2,98D:5303:1:1031:0
+PULS 4 HD Austria;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:35:9C4,98C,648,650,500,6E2,98D,9F0:5303:1:1031:0
 SAT.1 Gold Österreich;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:2815=2:2816=deu@3:42:0:5310:1:1031:0
 Pro7 MAXX Austria;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:3071=2:3072=deu@3:43:0:5311:1:1031:0
 kabel1 Doku austria;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:3327=2:3328=deu@3:44:0:5312:1:1031:0
@@ -292,21 +292,21 @@ 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
-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
+Bibel TV;SES ASTRA: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,1811,1863,1883: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,1811,1863,1883: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
 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:12146:1:1108:0
 ShopLC HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:511=27:512=deu@3,513=eng@15:0:0:21107:1:1053:0
 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
-tagesschau24;ARD:10743:HC56M2S0:S19.2E:22000:101=2:102=deu@3:104:0:28721:1:1051:0
-ONE;ARD:10743:HC56M2S0:S19.2E:22000:201=2:202=deu@3,203=mis@3;206=deu@106:204:0:28722:1:1051:0
-arte;ARD:10743:HC56M2S0:S19.2E:22000:401=2:402=deu@3,403=mis@3,407=mul@3,408=fra@3:404:0:28724:1:1051:0
-phoenix;ARD:10743:HC56M2S0:S19.2E:22000:501=2:502=deu@3,503=mul@3:504:0:28725:1:1051:0
-Test-R;ARD:10743:HC56M2S0:S19.2E:22000:501=2:502=deu@3:0:0:28726:1:1051:0
+WELT HD Austria;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:767=27:0;771=deu@106:0;37=deu:9C4,98C,648,650,500,98D,9F0: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
+phoenix;ARD:10743:HC56M2S0:S19.2E:22000:501=2:502=deu@3:0:0:28725:1:1051:0
+Test-R;ARD:10743:HC56M2S0:S19.2E:22000:501=2:259=deu@3:0:0:28726:1:1051:0
 F3 BNORMANDIE;CSAT:12721:HC23M5O20P0S1:S19.2E:23500:110=27:0;121=fra@106:0:1811,1883,1863,500:9801:1:1120:0
 F3 PAYS DE LA LOIRE;CSAT:12721:HC23M5O20P0S1:S19.2E:23500:210=27:0;221=fra@106:0:1811,1883,1863,500:9802:1:1120:0
 F3 COTE D'AZUR;CSAT:12721:HC23M5O20P0S1:S19.2E:23500:310=27:0;321=fra@106:0:1811,1883,1863,500:9803:1:1120:0
@@ -331,12 +331,65 @@ F3 PARIS IDF OBSOLETE;OBSOLETE CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2110=27:0;2
 F3 PICARDIE OBSOLETE;OBSOLETE CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2210=27:0;2221=fra@106:0:1811,1863,1883,500:9822:1:1120:0
 F3 RHONE ALPES OBSOLETE;OBSOLETE CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2310=27:0;2321=fra@106:0:1811,1863,1883,500:9823:1:1120: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;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:0:9C4,98C,98D: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
+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 OBSOLETE,Sky Sport M HD;OBSOLETE 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 OBSOLETE,Sky Sport PL HD;OBSOLETE SKY:11170:HC34M5O35P0S1:S19.2E:22000:3839=27:0;3842=qae@106,3844=qaf@106:0:9C4,98D,98C:145:133:9:0
+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=eng@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
-CANAL+;CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2510=36:0;2521=fra@106,2522=qaa@106,2523=qad@106:0;2542=fra,2543=fra:1883:9825:1:1120:0
-EVENEMENT SPORT 4K UHD;CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2610=36:0;2621=fra@106,2622=qaa@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
+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 OBSOLETE;OBSOLETE CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2610=36:0;2621=fra@106,2622=qaa@106:0;2642=fra,2643=fra:1883:9826:1:1120:0
+SWR 5.1 Kultur;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
+ARD-Test-R;ARD:11052:HC23M5O35P0S1:S19.2E:22000:5411=27:5412=deu@3:0:0:10390:1:1039:0
+RFI ST-LOUIS OBSOLETE;OBSOLETE Harmonic:12515:HC56M2S0:S19.2E:22000:0:889=@3:0:0:978:1:1106:0
+France 24 (en Francais);GLOBECAST:12552:VC56M2S0:S19.2E:22000:605=2:625=fra@3:6701:0:6905:1:1022:0
+France 24 (In English);GLOBECAST:12552:VC56M2S0:S19.2E:22000:606=2:626=eng@3:6702:0:6906:1:1022:0
+TV5MONDE EUROPE HD;GLOBECAST:12552:VC56M2S0:S19.2E:22000:615=27:635=fra@3:835;935=rus,936=eng,937=deu,938=dut,939=esl,940=rom,942=fra:0:6915:1:1022:0
+TRT World HD;GLOBECAST:12552:VC56M2S0:S19.2E:22000:618=27:638=eng@3:838:0:6918:1:1022:0
+Sky Cinema Family HD,Sky Family HD;SKY:11171:HC34M5O20P0S1:S19.2E:22000:0:0:0:0:139:133:2:0
+Sky One HD,Sky One HD;SKY:11171:HC34M5O20P0S1:S19.2E:22000:0:0:0:0:147:133:2:0
+Heimatkanal,Heimat;SKY:11171:HC34M5O20P0S1:S19.2E:22000:0:0:0:0:22:133:2:0
+Romance TV HD,Romance;SKY:11171:HC34M5O20P0S1:S19.2E:22000:0:0:0:0:518:133:2:0
+Sky Sport Bundesliga 2 HD,Sky Buli 2 HD;SKY:11171:HC34M5O20P0S1:S19.2E:22000:0:0:0:0:277:133:2:0
+Sky Sport 2 HD,Sky Sport 2 HD;SKY:11171:HC34M5O20P0S1:S19.2E:22000:0:0:0:0:278:133:2:0
+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,Sport F1;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,DAZN2;SKY:11171:HC34M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106:0:9C4,98C,9F0,98D:122:133:9:0
+Beate Uhse,BeateUhse;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,Sky Buli 6;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,Sky Austria 5;SKY:11171:HC34M5O35P0S1:S19.2E:22000:5119=27:0;5122=qae@106,5124=qaf@106:0:9C4,98C,98D,9F0:326:133:9:0
+Sky Cinema 2 OBSOLETE,Cinema 2;OBSOLETE SKY:11171:HC34M5O35P0S1:S19.2E:22000:1023=27:0:0:9C4,98C,98D,9F0:8:133:9:0
+Sky Sport Bundesliga 7,Sky Buli 7;SKY:11171:HC34M5O35P0S1:S19.2E:22000:4351=27:0;4354=qab@106,4356=qac@106:32:9C4,98C,98D,9F0:327:133:9:0
+Sky Sport 7,Sky Sport 7;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,Sky Sport 6;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
+One Terra;SES:12603:HC56M2S0:S19.2E:22000:767=27:768=deu@3:0:0:10552:1:1112:0
+Deluxe Rock;SES:12603:HC56M2S0:S19.2E:22000:1023=27:1024=deu@3:0:0:10553:1:1112:0
+Deluxe Rap;SES:12603:HC56M2S0:S19.2E:22000:1279=27:1280=deu@3:0:0:10554:1:1112:0
+Deluxe Dance by Kontor;SES:12603:HC56M2S0:S19.2E:22000:1535=27:1536=deu@3:0:0:10555:1:1112:0
+Deluxe Flashback;SES:12603:HC56M2S0:S19.2E:22000:1791=27:1792=deu@3:0:0:10556:1:1112:0
+Just Cooking;SES:12603:HC56M2S0:S19.2E:22000:2047=27:2048=deu@3:0:0:10557:1:1112:0
+Just Fishing;SES:12603:HC56M2S0:S19.2E:22000:2303=27:2304=deu@3:0:0:10558:1:1112:0
+Deluxe Lounge;SES:12603:HC56M2S0:S19.2E:22000:2559=27:2560=deu@3:0:0:10559:1:1112:0
+Red Adventure;SES:12603:HC56M2S0:S19.2E:22000:2815=27:2816=deu@3:0:0:10560:1:1112:0
+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 OBSOLETE;OBSOLETE BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:2303=27:0:0:0:10108:1:1033:0
+RiC NEU;IP Broadcast:11302:HC23M5O35P0S1:S19.2E:22000:1930=27:1931=deu@3:0:0:4930:1:1007:0
+FUSSBALL.TV 1,FUSSBALLTV 1;SKY:11171:HC34M5O35P0S1:S19.2E:22000:4863=27:0;4867=deu@106:0:9C4,98C,98D,9F0:115:133:9:0
+FUSSBALL.TV 2,FUSSBALLTV 2;SKY:11171:HC34M5O35P0S1:S19.2E:22000:5375=27:0;5379=deu@106:0:9C4,98C,98D,9F0:117:133:9:0
+Jednotka HD;A1 Broadcasting:12168:VC23M5O25P0S1:S19.2E:29700:1101=36:1102=slk@15,1103=mis@15:1131;1141=slk:B00:2001:366:40600:0
+Dvojka HD;A1 Broadcasting:12168:VC23M5O25P0S1:S19.2E:29700:1201=36:1202=slk@15,1203=mis@15:1231;1241=slk:B00:2002:366:40600:0
+Markiza HD;A1 Broadcasting:12168:VC23M5O25P0S1:S19.2E:29700:1301=36:1302=slk@15,1303=mul@15:0;1341=slk:B00:2003:366:40600:0
+JOJ HD;A1 Broadcasting:12168:VC23M5O25P0S1:S19.2E:29700:1401=36:1402=slk@15,1403=mul@15:1431;1441=slk:B00:2004:366:40600:0
+Doma HD;A1 Broadcasting:12168:VC23M5O25P0S1:S19.2E:29700:1501=36:1502=slk@15,1503=mul@15:0;1541=slk:B00:2005:366:40600:0
+JOJ Plus HD;A1 Broadcasting:12168:VC23M5O25P0S1:S19.2E:29700:1601=36:1602=slk@15,1603=mul@15:1631;1641=slk:B00:2006:366:40600:0
+Dajto HD;A1 Broadcasting:12168:VC23M5O25P0S1:S19.2E:29700:1701=36:1702=slk@15,1703=mul@15:0;1741=slk:B00:2007:366:40600:0
+Markiza Krimi HD;A1 Broadcasting:12168:VC23M5O25P0S1:S19.2E:29700:1901=36:1902=slk@15,1903=mul@15:0;1941=slk:B00:2009:366:40600:0
+Spark;A1 Broadcasting:12168:VC23M5O25P0S1:S19.2E:29700:2101=36:2102=slk@15:0:B00:2011:366:40600:0
+TA3 HD;A1 Broadcasting:12168:VC23M5O25P0S1:S19.2E:29700:2201=36:2202=slk@15:0:B00:2012:366:40600:0
+MCM Top HD;A1 Broadcasting:12168:VC23M5O25P0S1:S19.2E:29700:2601=27:2602=fra@3:2641:B00:2016:366:40600:0

vdr/config/plugins/epgsearch/epgsearch.conf

@@ -1,49 +1,13 @@
-2:Ich bin ein Star:1:2000:0015:1:S19.2E-1-1057-61200:0:0:1:0:0:0:::1:0:0:1::50:99:2:30: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
 6:Germany's next Topmodel:1:2000:2200:1:S19.2E-1-1017-61301:0:0:1:1:1:0:::1:0:0: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
-7:Daniela Katzenberger:1:2000:2300:1:S19.2E-1-1057-61205:0:0:1:1:1:0:::1:0:0:0:Daniela Katzenberger: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
-14:Der Lehrer:1:2000:2300:1:S19.2E-1-1057-61200:0:0:1:1:1:0:::0: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
-15:Modern Family:1:2200:0000:1:S19.2E-1-1057-61200: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
-16:Goodbye Deutschland!:1:2000:2230:1:S19.2E-1-1057-61201:0:0:1:1:1:0:::0:0:0: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
-17:Der Bachelor:1:2000:2200:1:S19.2E-1-1057-61200:0:0:1:1:1:0:::1:1:-8: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
-18:Die Bachelorette:1:2000:2200:1:S19.2E-1-1057-61200:0:0:1:1:1:0:::1:1:-8: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
-21:The Taste:1:2000:2200:1:S19.2E-1-1017-61300:0:0:1:1:1:0:::1:1:-8: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
-23:Adam sucht Eva:1:2000:0000:1:S19.2E-1-1019-10301|S19.2E-1-1017-61303:0:0:1:1:1:0:::1:0:0: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
-26:The Mick:0:::1:S19.2E-1-1017-61301:0:0:1:0:0:0:::1:0:0: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
 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
-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
-39:The Masked Singer:1:2000:2200:1:S19.2E-1-1017-61301:0:0:1:1:1:0:::1:0:0: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
-40:Das Sommerhaus der Stars:1:2000:2300:1:S19.2E-1-1057-61200:0:0:1:1:1:0:::1:0:0: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
-41:Promi Big Brother:1:2000:0200:1:S19.2E-1-1017-61300:0:0:1:1:1:0:::1:0:0:1::50:99:2:20: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
-42:the voice:1:2000:2200:1:S19.2E-1-1017-61300|S19.2E-1-1017-61301:0:0:1:1:1:0:::1:0:0: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
-45:Tom und Jerry:0:::0:0:0:0:1:1:1:0:::0:0:0:1:Kinder~Tom und Jerry:50:99:2:10:0:0:0::1:0:0:1:1:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
-46:bachelor in Paradise:1:2000:2200:1:S19.2E-1-1057-61200:0:0:1:1:1:0:::1:0:0: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
-48:Woozle Goozle:0:::1:S19.2E-1-1041-11931:0:0:1:1:1:0:::0:0:0:1:Kinder~Woozle Goozle: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
-49:Rosins Fettkampf - Lecker schlank mit Frank:1:2000:2300:1:S19.2E-1-1017-61302: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
+33:Akte X:1:2000:2300:1:S19.2E-1-1017-61301:0:0:1:1:1:0:::0: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
+41:Promi Big Brother:1:2000:0200:1:S19.2E-1-1017-61300:0:0:1:1:1:0:::0:0:0:1::50:99:2:20: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
 51:Promis unter Palmen:1:2000:2200:1:S19.2E-1-1017-61300:0:0:1:1:1:0:::1:0:0: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
-52:ancient aliens:1:2000:2300:1:S19.2E-1-1017-61305:0:0:1:1:1:0:::1:0:0:1::50:99:2:10:0:0:0::1:0:1:1:1:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
-53:Grizzy & die Lemminge:0:::1:S19.2E-1-1041-11931:0:0:1:1:1:0:::0:0:0:1:Kinder~Grizzy & die Lemminge:50:99:2:10:0:0:0::1:0:1:1:1:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
-54:Grill den Henssler:1:2000:2200:1:S19.2E-1-1057-61201:0:0:1:1:1:0:::1:0:0: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
-55:Kampf der Realitystars:1:2000:2200:1:S19.2E-1-1057-61205:0:0:1:1:1:0:::1:0:0: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
-56:Love Island:1:2000:2300:1:S19.2E-1-1057-61205:0:0:1:1:1:0:::1:0:0: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
+52:ancient aliens:1:2000:2300:1:S19.2E-1-1017-61305:0:0:1:1:1:0:::0:0:0:1::50:99:2:10:0:0:0::1:0:1:1:1:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
 57:Das perfekte Dinner:1:1800:2000:1:S19.2E-1-1057-61201:0:0:1:1:1:0:::0:0:0: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
-58:Temptation Island:0:::1:S19.2E-1-1057-61200:0:0:1:1:1:0:::1:0:0: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
-59:Ninja Warrior Germany Kids:0:::1:S19.2E-1-1041-11931:0:0:1:1:1:0:::1:1:-32: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
-61:Die Geissens:1:2000:2330:1:S19.2E-1-1057-61205:0:0:1:1:1:0:::1:0:0:1::50:99:2:10:0:0:0::1:0:1:1:1:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
-62:Are you the one:1:2000:2300:1:S19.2E-1-1057-61200:0:0:1:1:1:0:::1:0:0:1::50:99:2:10:0:0:0::1:0:1:1:1:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
-63:First Dates Hotel:1:2000:2200:1:S19.2E-1-1057-61201:0:0:1:1:1:0:::1:0:0: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
-65:5 Senses for Love:1:2000:2359:1:S19.2E-1-1017-61300:0:0:1:1:1:0:::1:0:0:1::50:99:2:10:0:0:0::1:0:1:1:0:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
 66:Beauty & The Nerd: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::0:0:0:0:0:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
-67:Beauty and the Beast:1:2100:0000:1:S19.2E-1-1017-61303: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
-68:Lego Masters:1:2000:2300:1:S19.2E-1-1057-61200:0:0:1:1:1:0:::1:0:0: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
 70:Hochzeit auf den ersten Blick:1:2000:2300:1:S19.2E-1-1017-61300:0:0:1:1:1:0:::1:0:0:0:Hochzeit auf den ersten Blick: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
-71:8 Zeugen:1:2000:0000:1:S19.2E-1-1019-10301|S19.2E-1-1041-11931:0:0:1:1:1:0:::1:0:0: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
 72:Das große Promi-Büßen: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::0:0:0:0:0:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
-73:Frau Jordan stellt gleich: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::0:0:0:0:0:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
-74:Die Poolbauer:1:1600:2000:1:S19.2E-1-1017-61302:0:0:1:1:1:0:::1:0:0: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
-75:Miniatur Wunderland XXL:0:::1:S19.2E-1-1041-11951:0:0:1:1:1:0:::1:0:0:1::50:99:2:10:0:0:0::1:0:1:1:0:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0
 76:Wer stiehlt die Show:1:2000:2300:1:S19.2E-1-1017-61301:0:1:1:1:1:0:::1:0:0:1:Wer stiehlt mir die Show?: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
+77:Schlag den Star:1:2000:2200:1:S19.2E-1-1017-61301:0:0:1:0:0:0:::1:0:0:1:Schlag den Star:50:99:2:10:0:0:0::1:0:0:1:1:0:0:0:0:0:0:0::1:0:0:0:0:0:0:0:0:0:90::0

vdr/config/setup.conf

@@ -27,6 +27,8 @@ EmergencyExit = 1
 EPGBugfixLevel = 3
 EPGLanguages = 
 EPGLinger = 0
+EPGPauseAfterScan = 0
+EPGScanMaxChannel = 0
 EPGScanTimeout = 5
 FoldersInTimerMenu = 1
 FontFix = Courier:Bold
@@ -129,23 +131,23 @@ live.ChannelGroups = 1,2,3,4,5;6,7,8,9,10;11,12,13,14,15;16,17,18,19,20;21,22,23
 live.LastChannel = 0
 live.LastSortingMode = dateasc
 live.LastWhatsOnListMode = list
-live.LocalNetMask = 192.168.0.0/24
+live.LocalNetMask = 192.168.0.1/24, 10.8.0.1/24
 live.MarkNewRec = 1
 live.ScheduleDuration = 8
 live.ScreenShotInterval = 1000
 live.ShowChannelsWithoutEPG = 0
-live.ShowIMDb = 1
+live.ShowIMDb = 0
 live.ShowInfoBox = 0
 live.ShowLogo = 0
+live.ShowPlayMediaplayer = 1
 live.StartPage = whatsonnow
 live.StreamdevPort = 3000
 live.StreamdevType = TS
-live.StreamVideoOpt0 = ffmpeg -loglevel warning -f mpegts -analyzeduration 1.2M -probesize 5M -i <input> -map 0:v -map 0:a:0 -c:v copy -c:a aac -ac 2
+live.StreamVideoOpt0 = ffmpeg -loglevel warning -f mpegts -analyzeduration 1.2M -probesize 5M -i <input> -map 0:v -map 0:a:0 -c:v libx264 -preset ultrafast -crf 23 -tune zerolatency -g 25 -r 25 -c:a aac -ac 2
 live.StreamVideoOpt1 = ffmpeg -loglevel warning -f mpegts -analyzeduration 1.2M -probesize 5M -i <input> -map 0:v -map 0:a:0 -c:v libx264 -preset ultrafast -crf 23 -tune zerolatency -g 25 -r 25 -c:a aac -ac 2
 live.StreamVideoOpt2 = ffmpeg -loglevel warning -f mpegts -analyzeduration 1.2M -probesize 5M -i <input> -map 0:v -map 0:a:0 -c:v libx264 -preset ultrafast -crf 23 -tune zerolatency -g 25 -r 25 -c:a aac -ac 2
 live.StreamVideoOpt3 = ffmpeg -loglevel warning -f mpegts -analyzeduration 1.2M -probesize 5M -i <input> -map 0:v -map 0:a:0 -c:v libx264 -preset ultrafast -crf 23 -tune zerolatency -g 25 -r 25 -c:a aac -ac 2
 live.Theme = marine
-live.UseAjax = 1
 live.UseAuth = 1
 live.UserdefTimes = 20:15
 live.UseStreamdev = 1
@@ -172,14 +174,15 @@ 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 = 10
 streamdev-server.ServerPort = 2004
 streamdev-server.StartHTTPServer = 1
 streamdev-server.StartIGMPServer = 0
 streamdev-server.StartServer = 1
 streamdev-server.StartSuspended = 1
+streamdev-server.SuspendMode = 1
 streamdev-server.VTPBindIP = 0.0.0.0
 streamdev-server.VTPPriority = 1
 vnsiserver.TimeshiftBufferDir = /vdr/timeshift

vdr/docker-compose.yml

@@ -1,15 +1,14 @@
-version: "3.2"
 services:
   vdr-server:
-    image: lapicidae/vdr-server
+    image: lapicidae/vdr-server:latest
     container_name: vdr-server
     environment:
       - PUID=1000
       - PGID=1004
       - TZ=Europe/Berlin
       - LANG=de_DE.UTF-8
-      - LOG2FILE=true
-      - PLUGINS=epgsearch live streamdev-server ddci2 markad svdrpservice vnsiserver
+      - LOG2FILE=false
+      - PLUGINS=epgsearch live ddci2 svdrpservice streamdev-server femon #markad vnsiserver robotv
     volumes:
       - ./system:/vdr/system
       - ./config:/vdr/config
@@ -22,8 +21,9 @@ services:
       - 2004:2004
       - 6419:6419
       - 6419:6419/udp
-      - 34890:34890 #optional-vnsi
-      - 8099:8099 #optional
+      #- 34892:34892 #optional-RoboTV
+      #- 34890:34890 #optional-vnsi
+      #- 8099:8099 #optional
     devices:
       - /dev/dvb:/dev/dvb
     cap_add:
@@ -31,11 +31,12 @@ services:
     labels:
       - "com.centurylinklabs.watchtower.monitor-only=true"
     restart: unless-stopped
+    stop_grace_period: 60s #important
 
 volumes:
   rec:
     driver: local
     driver_opts:
-      type: nfs
+      type: nfs4
       o: addr=${NFS_SERVER},rw
-      device: ":${PFAD}"
+      device: ":${PFAD}"

vpn/README.md

@@ -0,0 +1,12 @@
+<h2>WireGuard Easy</H2>
+<p></p>
+<p></p>
+<img src="https://cdn.icon-icons.com/icons2/2699/PNG/512/wireguard_logo_icon_167956.png" alt="WireGuard Easy" width="200" />
+<p></p>
+<p></p>
+<p><b>WireGuard Easy</b> ist ein simples, jedoch sehr schnelles VPN. Es ermöglicht eine sichere, private Netzwerkverbindung zwischen zwei Computern.
+WG-Easy hilft dabei, Wireguard zu konfigurieren und zu verwalten.
+</p>
+<p></p>
+<a href="https://github.com/wg-easy/wg-easy" target="_blank">WireGuard Easy</a>
+<p></p>

vpn/docker-compose.yml

@@ -1,15 +1,20 @@
-version: "3.8"
 services:
   wg-easy:
-    image: weejewel/wg-easy
+    image: ghcr.io/wg-easy/wg-easy
     container_name: wg-easy
     environment:
       - WG_HOST=${HOST}
-      - PASSWORD=${PASSWORD}
-      - WG_DEFAULT_DNS=192.168.0.1, fritz.box
-      - WG_ALLOWED_IPS=10.8.0.0/24, 192.168.0.0/24
+      # 
+      #  Probier mal diese Zeile ohne dem #
+      #- WG_DEFAULT_DNS=192.168.0.1      
+      #
+      #- WG_DEFAULT_DNS=192.168.0.111, 10.1.6.2, localdomain
+      #- WG_ALLOWED_IPS=10.8.0.0/24, 192.168.0.0/24
+      - PASSWORD_HASH=${HASH}
+      - UI_TRAFFIC_STATS=true
+      - UI_CHART_TYPE=3
     volumes:
-      - .:/etc/wireguard
+      - ./wg-easy:/etc/wireguard
     ports:
       - "51820:51820/udp"
       - "51821:51821/tcp"
@@ -19,4 +24,7 @@ services:
       - SYS_MODULE
     sysctls:
       - net.ipv4.ip_forward=1
-      - net.ipv4.conf.all.src_valid_mark=1
+      - net.ipv4.conf.all.src_valid_mark=1
+    labels:
+      - com.centurylinklabs.watchtower.enable=true
+