Compare commits

...

9 Commits

Author SHA1 Message Date
borgal
ca1799c230 Immich hinzugefügt 2023-11-23 17:01:28 +01:00
borgal
277bdd8679 Laufwerk angepasst 2023-11-23 16:58:57 +01:00
borgal
cd4a455835 Markad deaktiviert, da aktuell keine Funktion 2023-11-23 16:56:55 +01:00
borgal
1e035c5709 Suchtimer angepasst 2023-11-23 16:55:56 +01:00
borgal
621697ecc1 Sender angepasst 2023-11-23 16:55:17 +01:00
borgal
4654e9cfee Laufwerke angepasst 2023-11-23 16:53:47 +01:00
borgal
c2e83985eb Log deaktiviert, da hoher Speicherverbrauch 2023-11-23 16:52:12 +01:00
borgal
5ee577ae1a Änderung mit Hostname zurückgenommen 2023-11-23 16:51:02 +01:00
borgal
856aff3b72 ungenutzte Container gelöscht 2023-11-23 16:47:44 +01:00
14 changed files with 210 additions and 76 deletions

View File

@@ -18,6 +18,8 @@ dns:
port: 53 port: 53
anonymize_client_ip: false anonymize_client_ip: false
ratelimit: 0 ratelimit: 0
ratelimit_subnet_len_ipv4: 24
ratelimit_subnet_len_ipv6: 56
ratelimit_whitelist: [] ratelimit_whitelist: []
refuse_any: true refuse_any: true
upstream_dns: upstream_dns:
@@ -206,7 +208,24 @@ user_rules:
- '@@||lavieenrose.com^$important' - '@@||lavieenrose.com^$important'
- '||eventtrack.pandasecurity.com^$important' - '||eventtrack.pandasecurity.com^$important'
- '@@||telemetry-in.battle.net^$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'
- '||luminar4win.update.skylum.com^$important'
- '||luminar4.s3-accelerate.amazonaws.com^$important'
- '||stats-api.skylum.com^$important'
- '||geotargetly-1a441.appspot.com^$important'
- '||fx.macphun.com^$important'
- '||canonicalizer.ucsuri.tcs^$important'
- '||auth.macphun.com^$important'
- '||stats-api.skylum.com^$important'
- '||api.photolemur.com^$important'
- '||media.macphun.com^$important'
- '||luminaraiwin.skylum.com^$important'
- '||luminarneowin.skylum.com^$important'
dhcp: dhcp:
enabled: false enabled: false
interface_name: eth0 interface_name: eth0
@@ -430,6 +449,54 @@ clients:
use_global_blocked_services: true use_global_blocked_services: true
ignore_querylog: false ignore_querylog: false
ignore_statistics: 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: []
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: []
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: - safe_search:
enabled: false enabled: false
bing: false bing: false

View File

@@ -7,6 +7,7 @@ services:
hostname: TrueNAS hostname: TrueNAS
environment: environment:
- IP=192.168.0.11 - IP=192.168.0.11
- Label=TrueNas-Scan
- PATTERN="scan"_dd.mm.yyyy_hh:MM:ss - PATTERN="scan"_dd.mm.yyyy_hh:MM:ss
- PGID=1000 - PGID=1000
- PUID=1000 - PUID=1000

24
immich/.env.sample Normal file
View File

@@ -0,0 +1,24 @@
# 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
# 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

86
immich/docker-compose.yml Normal file
View File

@@ -0,0 +1,86 @@
version: "3.8"
services:
immich-server:
container_name: immich_server
image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
command: [ "start.sh", "immich" ]
volumes:
- ${UPLOAD_LOCATION}:/usr/src/app/upload
- /etc/localtime:/etc/localtime:ro
env_file:
- .env
ports:
- 8015:3001
depends_on:
- redis
- database
- typesense
restart: always
immich-microservices:
container_name: immich_microservices
image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
command: [ "start.sh", "microservices" ]
volumes:
- ${UPLOAD_LOCATION}:/usr/src/app/upload
- /etc/localtime:/etc/localtime:ro
env_file:
- .env
depends_on:
- redis
- database
- typesense
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
restart: always
typesense:
container_name: immich_typesense
image: typesense/typesense:0.24.1
environment:
- TYPESENSE_API_KEY=${TYPESENSE_API_KEY}
- TYPESENSE_DATA_DIR=/data
# remove this to get debug messages
- GLOG_minloglevel=1
volumes:
- ./tsdata:/data
restart: always
redis:
container_name: immich_redis
image: redis:6.2-alpine
env_file:
- .env
volumes:
- ./redis:/data
restart: always
database:
container_name: immich_postgres
image: postgres:14-alpine
env_file:
- .env
environment:
POSTGRES_PASSWORD: ${DB_PASSWORD}
POSTGRES_USER: ${DB_USERNAME}
POSTGRES_DB: ${DB_DATABASE_NAME}
volumes:
- ./DB-data:/var/lib/postgresql/data
restart: always
volumes:
Immich:
name: Immich
driver: local
driver_opts:
type: nfs
o: addr=${NFS_SERVER},rw
device: ":${PFAD}"

View File

@@ -7,7 +7,7 @@ services:
restart: always restart: always
# #
# mit logging, wenn es zu Problemen kommt - zum aktivieren muss der Container entfernt werden!!! # 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 # 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
# #
# ohne logging # 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 command: knxd -e 1.1.250 -E 1.1.210:49 -DTRS -c -i --send-delay=120 -B single -b ipt:192.168.0.200

View File

@@ -14,3 +14,7 @@ services:
- ./document_log:/var/log/onlyoffice - ./document_log:/var/log/onlyoffice
- ./document_data:/var/www/onlyoffice/Data - ./document_data:/var/www/onlyoffice/Data
- ./document_lib:/var/lib/onlyoffice - ./document_lib:/var/lib/onlyoffice
- ./fonts:/usr/share/fonts/truetype/custom
- ./redis:/var/lib/redis
- ./db:/var/lib/postgresql
- ./rabbitmq:/var/lib/rabbitmq

View File

@@ -35,7 +35,7 @@ ZDFinfo HD;ZDFvision:11347:VC23M5O35P0S1:S19.2E:22000:6710=27:6720=deu@3,6721=mi
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 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 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 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:5131=27:5132=deu@3,5133=mis@3,5137=qks@3;5136=deu@106:5134;5135=deu:0:10304: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 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 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 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 :->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 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 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@106:0:1830,1843,1860,186A,186D,9C4,98C,98D,1842,4B64,4AF4:2:1:1035: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:6205: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 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 05;SES:10993:HC56M5O35P0S1:S19.2E:22000:511=36:0;512=deu@122:0:0:6:1:1035:0
@@ -222,9 +222,9 @@ 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 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 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 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:0:0:0:0:13311:1:1005:0 meinTVshop;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 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 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:0:13314:1:1005:0 oe24.TV HD;-:11273:HC23M5O35P0S1:S19.2E:22000:3140=27:3141=deu@3:0:0:13314:1:1005:0
Service 13315 OBSOLETE;OBSOLETE ORS:11273:HC23M5O35P0S1:S19.2E:22000:0:0:0:0:13315:1:1005:0 Service 13315 OBSOLETE;OBSOLETE ORS:11273:HC23M5O35P0S1:S19.2E:22000:0:0: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 Stimmungsgarten TV;ORS:11273:HC23M5O35P0S1:S19.2E:22000:3160=27:3161=deu@3:0:0:13316:1:1005:0
@@ -272,9 +272,9 @@ a.tv HD;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1010=27:1012=deu@3:0:0:5800:1:1023:
münchen.tv HD;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1020=27:1022=deu@3:1025:0:5801:1:1023:0 münchen.tv HD;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1020=27:1022=deu@3:1025:0:5801:1:1023:0
rfo Regional Fernsehen Oberbayern HD:11552:HC23M5O35P0S1:S19.2E:22000:1030=27:1032=@3:0:0:5802:1:1023:0 rfo Regional Fernsehen Oberbayern HD:11552:HC23M5O35P0S1:S19.2E:22000:1030=27:1032=@3:0:0:5802:1:1023:0
a.tv HD .;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1010=27:1012=deu@3:0:0:5803:1:1023:0 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 tv.ingolstadt HD:11552:HC23M5O35P0S1:S19.2E:22000:1050=27:1052=@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 Lokal-TV-Portal HD;BMT:11552:HC23M5O35P0S1:S19.2E:22000:1001=27:0:0:0:5805:1:1023:0
NIEDERBAYERN TV HD:11552:HC23M5O35P0S1:S19.2E:22000:1080=27:1082=@3:0:0:5807:1:1023:0 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 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 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 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
@@ -337,11 +337,11 @@ Sky Sport Premier League HD OBSOLETE,Sky Sport PL HD;OBSOLETE SKY:11170:HC34M5O3
Canal Algerie;SES ASTRA:12544:HC56M2S0:S19.2E:22000:515=2:680=fra@4:0:0:12137:1:1108:0 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 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 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 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 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 SWR2 5.1;ARD SWR:11052:HC23M5O35P0S1:S19.2E:22000:0:581=deu@17:0:0:10448:1:1039:0
Service 13231;ORS:11243:HC56M2S0:S19.2E:22000:0:0:0:0:13231:1:1003:0 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 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 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 (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 France 24 (In English);GLOBECAST:12552:VC56M2S0:S19.2E:22000:606=2:626=eng@3:6702:0:6906:1:1022:0

View File

@@ -1,11 +1,11 @@
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 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 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 7:Daniela Katzenberger:1:2000:2300:1:S19.2E-1-1057-61205:0:0:1:1:1:0:::0: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
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 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 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 17:Der Bachelor:1:2000:2200:1:S19.2E-1-1057-61200:0:0:1:1:1:0:::0: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 18:Die Bachelorette:1:2000:2200:1:S19.2E-1-1057-61200:0:0:1:1:1:0:::0: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 21:The Taste:1:2000:2200:1:S19.2E-1-1017-61300:0:0:1:1:1:0:::0: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
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 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 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 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
@@ -14,20 +14,20 @@
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 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 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 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 39:The Masked Singer:1:2000:2200:1:S19.2E-1-1017-61301: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
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 40:Das Sommerhaus der Stars:1:2000:2300:1:S19.2E-1-1057-61200: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
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 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 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
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 46:bachelor in Paradise:1:2000:2200:1:S19.2E-1-1057-61200: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
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 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 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
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 55:Kampf der Realitystars:1:2000:2200:1:S19.2E-1-1057-61205: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
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 56:Love Island:1:2000:2300:1:S19.2E-1-1057-61205: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
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 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 58:Temptation Island:0:::1:S19.2E-1-1057-61200: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
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 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 61:Die Geissens:1:2000:2330:1:S19.2E-1-1057-61205: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
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 62:Are you the one:1:2000:2300:1:S19.2E-1-1057-61200: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
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 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 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
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 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
@@ -36,4 +36,4 @@
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 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 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
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 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
78:Deutschland sucht den Superstar: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 78:Deutschland sucht den Superstar:1:2000:2200:1:S19.2E-1-1057-61200: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

View File

@@ -9,7 +9,7 @@ services:
- TZ=Europe/Berlin - TZ=Europe/Berlin
- LANG=de_DE.UTF-8 - LANG=de_DE.UTF-8
- LOG2FILE=false - LOG2FILE=false
- PLUGINS=epgsearch live streamdev-server ddci2 svdrpservice markad femon #vnsiserver - PLUGINS=epgsearch live streamdev-server ddci2 svdrpservice femon #vnsiserver markad
volumes: volumes:
- ./system:/vdr/system - ./system:/vdr/system
- ./config:/vdr/config - ./config:/vdr/config

View File

@@ -8,7 +8,7 @@ services:
- "8014:80" - "8014:80"
volumes: volumes:
# data # data
- $HOME/Download:/data/download - ./data:/data
- Photos:/data/Photos - Photos:/data/Photos
# user and password # user and password
- ./user/htpasswd:/opt/nginx/conf/htpasswd:ro - ./user/htpasswd:/opt/nginx/conf/htpasswd:ro

View File

@@ -1,19 +0,0 @@
version: "2.1"
services:
wireshark:
image: lscr.io/linuxserver/wireshark:latest
container_name: wireshark
cap_add:
- NET_ADMIN
security_opt:
- seccomp:unconfined #optional
#network_mode: host
environment:
- PUID=1000
- PGID=1000
- TZ=Europe/Berlin
volumes:
- ./config:/config
ports:
- 3010:3000 #optional
restart: unless-stopped

View File

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

View File

@@ -1,2 +0,0 @@
<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>

View File

@@ -1,25 +0,0 @@
version: "3.4"
services:
ytdl_material:
image: tzahi12345/youtubedl-material:latest
container_name: youtubeDL
environment:
ALLOW_CONFIG_MUTATIONS: 'true'
volumes:
- ./appdata:/app/appdata
- youtubeDL:/app/audio
- ./video:/app/video
- ./subscriptions:/app/subscriptions
- ./users:/app/users
ports:
- "8998:17442"
restart: always
volumes:
youtubeDL:
name: youtubeDL
driver: local
driver_opts:
type: nfs
o: addr=${NFS_SERVER},rw
device: ":${PFAD}"