Watchtower Ausnahme

config angepasst
2023-09-07 20:40:14 +02:00 · 2023-09-07 20:39:09 +02:00 · 2023-09-07 20:38:40 +02:00 · 2023-09-07 20:38:25 +02:00 · 2023-09-07 20:37:49 +02:00 · 2023-09-07 20:37:09 +02:00
17 changed files with 335 additions and 129 deletions
--- a/adguard/conf/AdGuardHome.yaml
+++ b/adguard/conf/AdGuardHome.yaml
@@ -1,27 +1,22 @@
-bind_host: 0.0.0.0
-bind_port: 3000
+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: ""
+language: de
 theme: auto
-debug_pprof: false
-web_session_ttl: 720
 dns:
  bind_hosts:
    - 0.0.0.0
  port: 53
  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_whitelist: []
  refuse_any: true
@@ -34,13 +29,14 @@ dns:
    - 8.8.4.4
    - '############# Lokal'
    - '[/fritz.box/]192.168.0.1'
-    - '[/192.in-addr.arpa/]192.168.0.1'
+    - '[/168.192.in-addr.arpa/]192.168.0.1'
  upstream_dns_file: ""
  bootstrap_dns:
    - 1.1.1.1
    - 1.0.0.1
    - 8.8.8.8
    - 8.8.4.4
+  fallback_dns: []
  all_servers: false
  fastest_addr: false
  fastest_timeout: 1s
@@ -68,17 +64,7 @@ dns:
  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: true
@@ -103,15 +89,15 @@ tls:
  private_key_path: ""
  strict_sni_check: false
 querylog:
-  enabled: true
-  file_enabled: true
+  ignored: []
  interval: 24h
  size_memory: 1000
-  ignored: []
-statistics:
  enabled: true
-  interval: 1
+  file_enabled: true
+statistics:
  ignored: []
+  interval: 24h
+  enabled: true
 filters:
  - enabled: true
    url: https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt
@@ -157,7 +143,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
@@ -208,6 +194,19 @@ user_rules:
  - '@@||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'
+  - '||eventtrack.pandasecurity.com^$important'
+  - '@@||telemetry-in.battle.net^$important'
+  - ""
 dhcp:
  enabled: false
  interface_name: eth0
@@ -225,6 +224,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
@@ -233,99 +262,208 @@ 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: []
      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.56
-      blocked_services: []
+      tags: []
      upstreams: []
      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: []
      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: []
      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: []
      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: []
+      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: []
      use_global_settings: false
      filtering_enabled: true
      parental_enabled: false
-      safesearch_enabled: false
      safebrowsing_enabled: true
      use_global_blocked_services: true
-    - name: Sandra-P30
-      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: Sandra-P30
      ids:
        - 192.168.0.46
-      blocked_services: []
+      tags: []
      upstreams: []
      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: 17
+schema_version: 27
--- a/adguard/docker-compose.yml
+++ b/adguard/docker-compose.yml
@@ -8,12 +8,9 @@ services:
      - ./conf:/opt/adguardhome/conf
      - /etc/localtime:/etc/localtime:ro
    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
--- a/bookstack/docker-compose.yml
+++ b/bookstack/docker-compose.yml
@@ -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
--- a/code-server/docker-compose.yml
+++ b/code-server/docker-compose.yml
@@ -19,8 +19,8 @@ services:
      - www:/www
    ports:
      - 8181:8443
-      - 8184:5500
-      - 5555:5555
+#      - 8184:5500
+#      - 5555:5555
    restart: unless-stopped

 volumes:
--- a/drawio/docker-compose.yml
+++ b/drawio/docker-compose.yml
@@ -6,4 +6,3 @@ services:
    restart: unless-stopped
    ports:
      - 8085:8080
-      - 8445:8443
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"

 services:
  gitea:
-    image: gitea/gitea:latest
+    image: gitea/gitea
    container_name: gitea
    environment:
      - USER_UID=1000
--- a/grafana/docker-compose.yml
+++ b/grafana/docker-compose.yml
@@ -5,7 +5,7 @@ services:
    container_name: influxdb
    ports:
      - 8096:8086
-      - 8098:8088
+      #- 8098:8088
    volumes:
      - ./influxdb:/var/lib/influxdb
    environment:
--- a/heimdall/docker-compose.yml
+++ b/heimdall/docker-compose.yml
@@ -11,5 +11,4 @@ services:
      - /opt/heimdall/data:/config
    ports:
      - 8124:80
-      - 8143:443
    restart: unless-stopped
--- a/onlyoffice/.env.sample
+++ b/onlyoffice/.env.sample
@@ -0,0 +1 @@
+SECRET=ChangeMe
--- a/owncloud/.env.sample
+++ b/owncloud/.env.sample
@@ -0,0 +1,4 @@
+OWNCLOUD_DOMAIN=owncloud.domain.de
+OWNCLOUD_TRUSTED_DOMAINS=owncloud.domain.de
+ADMIN_USERNAME=ChangeMe
+ADMIN_PASSWORD=ChangeMe
--- a/owncloud/docker-compose.yml
+++ b/owncloud/docker-compose.yml
@@ -0,0 +1,64 @@
+version: "3"
+
+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.6 # minimum required ownCloud version is 10.9
+    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
--- a/paperless/docker-compose.yml
+++ b/paperless/docker-compose.yml
@@ -45,6 +45,8 @@ services:
      POSTGRES_DB: paperless
      POSTGRES_USER: paperless
      POSTGRES_PASSWORD: paperless
+    labels:
+      - "com.centurylinklabs.watchtower.monitor-only=true"

  webserver:
    image: ghcr.io/paperless-ngx/paperless-ngx
--- a/ports.md
+++ b/ports.md
@@ -5,20 +5,17 @@ reverse-porxy       	|	80
 reverse-porxy       	|	81
 gitea               	|	222
 reverse-porxy       	|	443
-adguard             	|	853
-adguard             	|	1082
-adguard             	|	1443
 node-red            	|	1880
+node-red MQTT          	|	1883
 vdr			|	2004
 adguard             	|	3000
+wireshark            	|	3010
 vdr			|	3020
 gitea               	|	3030
-adguard			|	3080
-bookstack_db        	|	3306
+grafana			|	3090
 fredbed_db          	|	3307
 webserver_db        	|	3309
 unifi controller    	|	3478
-code-server		|	5555
 vdr			|	6419
 bookstack	        |	6875
 portainer	        |	8000
@@ -27,8 +24,10 @@ wekan			|	8004
 vdr			|	8008
 paperless           	|	8009
 grocy			|	8011
-filerun			|	8013
+photoview		|	8012
+owncloud		|	8013
 webdav			|	8014
+onlyoffice		|	8016
 unifi controller    	|	8080
 openhab		        |	8081
 fredbed		        |	8083
@@ -36,27 +35,19 @@ bitwarden           	|	8084
 drawio              	|	8085
 Uptime Kuma         	|	8086
 webserver_phpmyadmin	|	8087
-pigallery2		|	8090
+grafana influxdb	|	8096
 vdr			|	8099
 homeassistant       	|	8123
 heimdall	        |	8124
-heimdall	        |	8143
 webserver	        |	8180
 code-Server	        |	8181
 sshwifty            	|	8182
-code-server		|	8184
 duplicati		|	8200
-syncthing		|	8384	
-unifi controller    	|	8443
 openhab		        |	8444
-drawio              	|	8445
 youTubeDL	        |	8998
 portainer	        |	9000
 unifi controller    	|	10001
-syncthing TCP		|	22000
-syncthing UDP		|	22000
-syncthing UDP		|	21027
-vdr			|	34890			
+vdr-vnsi		|	34890			
 wireguard		|	51820
 wireguard		|	51821
 mumble	            	|	64738
--- a/vdr/config/channels.conf
+++ b/vdr/config/channels.conf
@@ -18,7 +18,7 @@ ATV HD;ATV:11243:HC56M2S0:S19.2E:22000:2280=27:2281=deu@3:2285:648,650,D95,D98,5
 :->Doku
 ntv HD;CBC:10832:HC23M5O35P0S1:S19.2E:22000:1279=27:0;1283=deu@106,1284=mul@106:36:1830,1843,1860,98C,9C4,648,650,186A,500,186D,6E2,98D:61204:1:1057:0
 phoenix HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5261=27:5262=deu@3,5263=mul@3:5264:0:10331:1:1025:0
-WELT HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:767=27:0;771=deu@106:0:1830,1843,9C4,98C,648,1860,186A,98D,186D,1842,4B64,4AF4:21108:1:1053:0
+WELT HD;BetaDigital:10773:HC34M5O20P0S1:S19.2E:22000:767=27:0;771=deu@106:0;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: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
@@ -30,12 +30,12 @@ Deluxe Music HD;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@
 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
 :-> 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,5127=qks@3;5126=deu@106:5134;5135=deu:0:10304:1:1019:0
+SWR RP HD;ARD:11493:HC23M5O35P0S1:S19.2E:22000:5131=27:5132=deu@3,5133=mis@3,5137=qks@3;5136=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
@@ -72,7 +72,7 @@ HSE Extra HD;BetaDigital:10802:HC34M5O35P0S1:S19.2E:22000:511=27:0;515=deu@106:3
 :->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
+UHD1 by ASTRA / HD+;SES ASTRA:10993:HC56M5O35P0S1:S19.2E:22000:101=36:0;102=deu@106:0:1830,1843,1860,186A,186D,9C4,98C,98D,1842,4B64,4AF4: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
 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
@@ -80,7 +80,7 @@ SES UHD Demo Channel 04;SES:10993:HC56M5O35P0S1:S19.2E:22000:511=36:0;512=deu@12
 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
+BILD HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:511=27:0;515=deu@106:0;34=deu: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
@@ -97,7 +97,7 @@ kabel eins classics;ProSiebenSat.1:11670:HC23M5O35P0S1:S19.2E:22000:3839=27:3840
 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
 .;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
+SRGT;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
@@ -166,7 +166,7 @@ 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
+WDR 2;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
@@ -178,18 +178,18 @@ 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:33:1830,1860,1843,98C,9C4,186A,186D,98D,1842,4B64,4AF4:12502:1:1043:0
 .;SES ASTRA:11111:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:0:1830,1843,1860,186A,186D,1842,4B64,4AF4:12503:1:1043:0
 .;SES ASTRA:11111:HC23M5O35P0S1:S19.2E:22000:0:0:0:0:12510:1:1043:0
 SAT.1 Gold HD Austria;ProSiebenSat.1:11111:HC23M5O35P0S1:S19.2E:22000:255=27:0;259=deu@106:32:9C4,98C,500,6E2,98D:12520:1:1043:0
 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 HD OBSOLETE,Sky Action HD;OBSOLETE SKY:11170:HC34M5O35P0S1:S19.2E:22000:767=27:0;771=deu@106,772=eng@106:0:9C4,98C,98D: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:98C,9C4,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:98C,98D,9C4:123:133:9:0
-DAZN 1 HD,DAZN1HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:1791=27:0;1795=deu@106:0:98D,9C4,98C: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,98D,9C4: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:9C4,98D,98C: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 HD OBSOLETE,DAZN1HD;OBSOLETE SKY:11170:HC34M5O35P0S1:S19.2E:22000:1791=27:0;1795=deu@106:0:98D,9C4,98C: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
@@ -206,7 +206,7 @@ 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
-Service 13412;ORF:11214:HC34M5O20P0S1:S19.2E:23500:0:0:0:0:13412:1:1001:0
+Service13412;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
@@ -222,7 +222,7 @@ ORF2V HD;ORF:11273:HC23M5O35P0S1:S19.2E:22000:3000=27:0;3001=deu@106,3002=mis@10
 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
+Aristo.TV;ORF:11273:HC23M5O35P0S1:S19.2E:22000:0:0: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
@@ -274,7 +274,7 @@ rfo Regional Fernsehen Oberbayern HD:11552:HC23M5O35P0S1:S19.2E:22000:1030=27:10
 a.tv HD .;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1010=27:1012=deu@3:0:0:5803:1:1023:0
 tv.ingolstadt HD;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1050=27:1052=deu@3:0:0:5804:1:1023:0
 Lokal-TV-Portal HD;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1001=27:0:0:0:5805:1:1023:0
-NIEDERBAYERN TV HD;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1080=27:1082=deu@3:0:0:5807:1:1023:0
+NIEDERBAYERN TV HD:11552:HC23M5O35P0S1:S19.2E:22000:1080=27:1082=@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
@@ -292,16 +292,16 @@ 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;MTI:12544:HC56M2S0:S19.2E:22000:33=2:34=deu@3:36:0:12122:1:1108:0
-Cherie 25;SES ASTRA:12544:HC56M2S0:S19.2E:22000:5301=27:0;5302=fra@106,5303=eng@106,5304=qad@106:0;5305=fra,5306=fra:500,1883,1863,1811:12140:1:1108:0
-Cherie 25;SES ASTRA:12544:HC56M2S0:S19.2E:22000:5301=27:0;5302=fra@106,5303=eng@106,5304=qad@106:0;5305=fra,5306=fra:500,1883,1863,1811:12141:1:1108:0
+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:0:9C4,98C,648,650,500,98D:21118:1:1053: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: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
@@ -332,14 +332,18 @@ F3 PICARDIE OBSOLETE;OBSOLETE CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2210=27:0;22
 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 OBSOLETE;OBSOLETE BetaDigital:10920:HC78M2S0:S19.2E:22000:2815=27:2816=deu@3,2817=bul@3,2818=cze@3,2819=hun@3:0;2821=ron:1837,624,D96,1817,1818,B02,100,500,1867,653,181D:34:133:15:0
-Sky Sport Mix HD,Sky Sport M HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:255=27:0;258=qae@106,260=qaf@106:0:9C4,98C,98D:141:133:9:0
-Sky Sport Premier League HD,Sky Sport PL HD;SKY:11170:HC34M5O35P0S1:S19.2E:22000:3839=27:0;3842=qae@106:0:9C4,98D,98C:145:133:9:0
-Canal Algerie;TDA:12544:HC56M2S0:S19.2E:22000:515=2:680=fra@4:0:0:12137:1:1108:0
-Algerie 3;TDA:12544:HC56M2S0:S19.2E:22000:514=2:670=fra@4:0:0:12138:1:1108:0
-SBN International;SES:12544:HC56M2S0:S19.2E:22000:2001=2:3001=@4,4001=@4:5001:0:12186:1:1108:0
-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
+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=fra@4:0:0:12138:1:1108:0
+SBN International;SES ASTRA:12544:HC56M2S0:S19.2E:22000:2001=2:3001=@4,4001=@4:5001:0:12186:1:1108:0
+CANAL+;CSAT:12721:HC23M5O20P0S1:S19.2E:23500:2510=36:0;2521=fra@106,2522=qaa@106,2523=qad@106:0;2542=fra,2543=fra:0: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
-Service 13231 OBSOLETE;OBSOLETE ORS:11243:HC56M2S0:S19.2E:22000:0:0:0:0:13231:1:1003: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:5401=27:5402=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
--- a/vdr/docker-compose.yml
+++ b/vdr/docker-compose.yml
@@ -8,8 +8,8 @@ services:
      - PGID=1004
      - TZ=Europe/Berlin
      - LANG=de_DE.UTF-8
-      - LOG2FILE=true
-      - PLUGINS=epgsearch live streamdev-server ddci2 svdrpservice markad #vnsiserver
+      - LOG2FILE=false
+      - PLUGINS=epgsearch live streamdev-server ddci2 svdrpservice markad femon #vnsiserver
    volumes:
      - ./system:/vdr/system
      - ./config:/vdr/config
--- a/watchtower/docker-compose.yml
+++ b/watchtower/docker-compose.yml
@@ -9,7 +9,12 @@ services:
      - WATCHTOWER_NOTIFICATIONS=gotify
      - WATCHTOWER_NOTIFICATION_GOTIFY_URL=https://gotify.borgal.de
      - WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN=AlsHK7YQ17in5Ns
-      - WATCHTOWER_WARN_ON_HEAD_FAILURE=never
+      - WATCHTOWER_WARN_ON_HEAD_FAILURE=auto                  #always, auto, never, stand auf never
+      - WATCHTOWER_CLEANUP=true
+      - WATCHTOWER_SCHEDULE=0 15 19 * * *
+      - WATCHTOWER_INCLUDE_RESTARTING=true
+      - WATCHTOWER_ROLLING_RESTART=true
+      - WATCHTOWER_INCLUDE_STOPPED=true
      - TZ=Europe/Berlin

    volumes:
@@ -17,6 +22,6 @@ services:
      - /etc/localtime:/etc/localtime:ro

    #command: --monitor-only --schedule "0 09 22 * * *"
-    command: --rolling-restart --schedule "0 15 19 * * *" --cleanup --include-restarting --include-stopped 
+    #command: --rolling-restart --schedule "0 15 19 * * *" --cleanup --include-restarting --include-stopped 

    restart: unless-stopped
--- a/wekan/docker-compose.yml
+++ b/wekan/docker-compose.yml
@@ -2,7 +2,7 @@
 version: '2'
 services:
  wekandb:
-    image: mongo:latest
+    image: mongo:6
    container_name: wekan-db
    restart: unless-stopped
    # Disable MongoDB logs:
@@ -17,18 +17,19 @@ services:
      - /etc/timezone:/etc/timezone:ro

  wekan:
-    image: wekanteam/wekan
+    image: wekanteam/wekan:latest
    container_name: wekan-app
    restart: unless-stopped
    ports:
      - 8004:8080
    environment:
+      - WRITABLE_PATH=/data
      - MONGO_URL=mongodb://wekandb:27017/wekan
      - ROOT_URL=https://${APP_URL}
      - WITH_API=true
      - RICHER_CARD_COMMENT_EDITOR=false
      - CARD_OPENED_WEBHOOK_ENABLED=false
-      - BIGEVENTS_PATTERN=received|start|due|end
+      - BIGEVENTS_PATTERN=NONE # received|start|due|end
      - BROWSER_POLICY_ENABLED=true
      - MAIL_URL=smtp://${MAIL_USER}:${MAIL_PASS}@smtp.strato.de:587?tls={ciphers:"SSLv3"}&secureConnection=false
      - MAIL_FROM='ToDo Info <${FROM}>'
@@ -36,3 +37,6 @@ services:
      - NOTIFY_DUE_AT_HOUR_OF_DAY=8
    depends_on:
      - wekandb
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - ./wekan-files:/data:rw
Author	SHA1	Message	Date
borgal	9232728de9	Watchtower Ausnahme	2023-09-07 20:40:14 +02:00
borgal	82640b8ca0	config angepasst	2023-09-07 20:39:09 +02:00
borgal	0993c9984e	config angepasst	2023-09-07 20:38:40 +02:00
borgal	5f32bb3eee	config angepasst	2023-09-07 20:38:25 +02:00
borgal	6dfa02eb96	port angepasst	2023-09-07 20:37:49 +02:00
borgal	20de526189	Config angepasst	2023-09-07 20:37:09 +02:00
borgal	ed4913ff80	Config angepasst	2023-09-07 20:36:51 +02:00
borgal	e109c58a57	erneut hinzugefügt	2023-09-07 15:36:04 +02:00
borgal	2e89a07dd0	Merge branch 'master' of http://git.borgal.de/Borgal/docker	2023-09-07 15:31:35 +02:00
borgal	cb5c39a774	entfernen	2023-09-07 15:31:05 +02:00
borgal	9b627c44b2	Ports angepasst	2023-05-31 21:55:00 +02:00
borgal	2b7c2374dc	Ports angepasst	2023-05-31 21:54:34 +02:00
borgal	6f55177b34	Ports angepasst	2023-05-31 21:54:17 +02:00
borgal	9099910dd9	Ports angepasst	2023-05-31 21:54:07 +02:00
borgal	cf31a104ab	Ports angepasst	2023-05-31 21:53:34 +02:00
borgal	2edc6fea8e	Ports angepasst	2023-05-31 21:53:23 +02:00
borgal	39b14aa91b	Ports angepasst	2023-05-31 21:53:11 +02:00
borgal	ad8d63857b	owncloud hinzugefügt	2023-05-31 21:52:12 +02:00
borgal	73aa80bd81	onlyoffice hinzugefügt	2023-05-31 21:51:51 +02:00