Borgal/docker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KNXd Adressbereich und VDR Conf angepasst

Browse Source
This commit is contained in:
borgal
2022-08-10 21:45:34 +00:00
parent e2a95ff9b6
commit 326f616058
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
knxd/docker-compose.yml
View File

@@ -7,7 +7,7 @@ services:
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:30 -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
# 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

7
vdr/config/channels.conf
View File

@@ -33,7 +33,7 @@ MTV HD;BetaDigital:10964:HC23M5O35P0S1:S19.2E:22000:1023=27:0;1027=deu@106:0:183
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
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:5211=27:5212=deu@3,5213=mis@3;5216=deu@106:5204:0:10326:1:1025:0
BR Fernsehen Nord HD;ARD:11582:HC23M5O35P0S1:S19.2E:22000:5201=27:5202=deu@3,5203=mis@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;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
@@ -188,7 +188,7 @@ Sky Sport Austria 1 HD OBSOLETE,Sky Austria 1 HD;OBSOLETE SKY:11170:HC34M5O35P0S
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:0:0:0:0:297: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
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
@@ -206,7 +206,7 @@ Service 13233;ORS:11243:HC56M2S0:S19.2E:22000:0:0:0:0:13233:1:1003:0
Service 13401 OBSOLETE;OBSOLETE 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
@@ -339,3 +339,4 @@ 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
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

10
vdr/config/setup.conf
View File

@@ -104,8 +104,8 @@ SubtitleFgTransparency = 0
SubtitleLanguages =
SubtitleOffset = 0
SVDRPDefaultHost =
SVDRPHostName = docker
SVDRPPeering = 1
SVDRPHostName =
SVDRPPeering = 0
SVDRPTimeout = 300
TimeoutRequChInfo = 1
TimeSource =
@@ -123,11 +123,13 @@ VolumeSteps = 51
VpsMargin = 120
ZapTimeout = 3
epgsearch.UseSearchTimers = 1
live.AdminLogin = admin
live.AdminPasswordMD5 = 11:cfe6747cfcfba83cdc5c8ff06e4c6cbf
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.LocalNetMask = 192.168.0.0/24
live.MarkNewRec = 1
live.ScheduleDuration = 8
live.ScreenShotInterval = 1000
@@ -144,7 +146,7 @@ live.StreamVideoOpt2 = ffmpeg -loglevel warning -f mpegts -analyzeduration 1.2M
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 = 0
live.UseAuth = 1
live.UserdefTimes = 20:15
live.UseStreamdev = 1
markad.DeferredShutdown = 0

14
vdr/docker-compose.yml
View File

@@ -9,27 +9,27 @@ services:
- TZ=Europe/Berlin
- LANG=de_DE.UTF-8
- LOG2FILE=true
- PLUGINS=epgsearch live streamdev-server ddci2 markad vnsiserver
- PLUGINS=epgsearch live streamdev-server ddci2 markad svdrpservice vnsiserver
volumes:
- ./system:/vdr/system
- ./config:/vdr/config
- rec:/vdr/recordings
- ./cache:/vdr/cache
- ./log:/vdr/log #optional
- ./log:/vdr/log
ports:
- 8008:8008
- 3000:3000
- 2004:2004
- 6419:6419 #optional
- 6419:6419/udp #optional
- 34890:34890 #optional
- 6419:6419
- 6419:6419/udp
- 34890:34890 #optional-vnsi
- 8099:8099 #optional
devices:
- /dev/dvb:/dev/dvb #optional
- /dev/dvb:/dev/dvb
cap_add:
- SYS_TIME #optional: read hint!
labels:
- "com.centurylinklabs.watchtower.enable=false"
- "com.centurylinklabs.watchtower.monitor-only=true"
restart: unless-stopped
volumes: