diff --git a/node-red/docker-compose.yml b/node-red/docker-compose.yml index 9e6f2a1..7c7b2a4 100644 --- a/node-red/docker-compose.yml +++ b/node-red/docker-compose.yml @@ -4,18 +4,14 @@ services: nodered: container_name: node-red image: nodered/node-red -# user: root + user: 0:0 ports: - "1880:1880" -# dns: -# - 192.168.0.1 -# - 8.8.8.8 volumes: - ./data:/data -# - /etc/localtime:/etc/localtime:ro environment: - TZ=Europe/Berlin - PGID=1000 - PUID=1000 restart: always - network_mode: host +# network_mode: host \ No newline at end of file diff --git a/paperless/docker-compose.env b/paperless/docker-compose.env index caa2de3..8cbc3ed 100644 --- a/paperless/docker-compose.env +++ b/paperless/docker-compose.env @@ -2,7 +2,7 @@ # to your UID and GID on the host so that you have write access to the # consumption directory. USERMAP_UID=1000 -USERMAP_GID=1000 +USERMAP_GID=1001 # Additional languages to install for text recognition, separated by a # whitespace. Note that this is diff --git a/paperless/docker-compose.yml b/paperless/docker-compose.yml index 7befcdd..f83d96a 100644 --- a/paperless/docker-compose.yml +++ b/paperless/docker-compose.yml @@ -68,6 +68,8 @@ services: - ./consume:/usr/src/paperless/consume env_file: docker-compose.env environment: + PUID: 1000 + PGID: 1001 PAPERLESS_REDIS: redis://broker:6379 PAPERLESS_DBHOST: db diff --git a/vdr/config/channels.conf b/vdr/config/channels.conf index 64bba7f..4e0fab7 100644 --- a/vdr/config/channels.conf +++ b/vdr/config/channels.conf @@ -203,10 +203,10 @@ 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 Service 13233;ORS:11243:HC56M2S0:S19.2E:22000:0:0:0:0:13233:1:1003:0 -Service 13401;ORS:11214:HC34M5O20P0S1:S19.2E:23500:0:0:0:0:13401:1:1001: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 @@ -272,7 +272,7 @@ 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 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 -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 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 @@ -332,11 +332,11 @@ 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;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: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,3844=qaf@106:0:9C4,98C,98D:145:133:9: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 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: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 SWR2 5.1;ARD SWR:11052:HC23M5O35P0S1:S19.2E:22000:0:581=deu@17:0:0:10448:1:1039:0 diff --git a/web/docker-compose.yml b/web/docker-compose.yml index f357291..f072422 100644 --- a/web/docker-compose.yml +++ b/web/docker-compose.yml @@ -15,7 +15,8 @@ services: links: - database labels: - - "com.centurylinklabs.watchtower.enable=false" +# com.centurylinklabs.watchtower.monitor-only: "true" + com.centurylinklabs.watchtower.enable: "false" restart: unless-stopped database: