3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #198724 from Izorkin/update-peertube

This commit is contained in:
Sandro 2022-11-16 02:51:47 +01:00 committed by GitHub
commit 655ab77b16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -67,7 +67,11 @@ let
node ~/dist/server/tools/peertube.js $@ node ~/dist/server/tools/peertube.js $@
''; '';
nginxCommonHeaders = '' nginxCommonHeaders = lib.optionalString cfg.enableWebHttps ''
add_header Strict-Transport-Security 'max-age=63072000; includeSubDomains';
'' + lib.optionalString config.services.nginx.virtualHosts.${cfg.localDomain}.http3 ''
add_header Alt-Svc 'h3=":443"; ma=86400';
'' + ''
add_header Access-Control-Allow-Origin '*'; add_header Access-Control-Allow-Origin '*';
add_header Access-Control-Allow-Methods 'GET, OPTIONS'; add_header Access-Control-Allow-Methods 'GET, OPTIONS';
add_header Access-Control-Allow-Headers 'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; add_header Access-Control-Allow-Headers 'Range,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type';
@ -370,7 +374,7 @@ in {
systemd.services.peertube-init-db = lib.mkIf cfg.database.createLocally { systemd.services.peertube-init-db = lib.mkIf cfg.database.createLocally {
description = "Initialization database for PeerTube daemon"; description = "Initialization database for PeerTube daemon";
after = [ "network.target" "postgresql.service" ]; after = [ "network.target" "postgresql.service" ];
wantedBy = [ "multi-user.target" ]; requires = [ "postgresql.service" ];
script = let script = let
psqlSetupCommands = pkgs.writeText "peertube-init.sql" '' psqlSetupCommands = pkgs.writeText "peertube-init.sql" ''
@ -399,7 +403,9 @@ in {
systemd.services.peertube = { systemd.services.peertube = {
description = "PeerTube daemon"; description = "PeerTube daemon";
after = [ "network.target" ] after = [ "network.target" ]
++ lib.optionals cfg.redis.createLocally [ "redis.service" ] ++ lib.optional cfg.redis.createLocally "redis-peertube.service"
++ lib.optionals cfg.database.createLocally [ "postgresql.service" "peertube-init-db.service" ];
requires = lib.optional cfg.redis.createLocally "redis-peertube.service"
++ lib.optionals cfg.database.createLocally [ "postgresql.service" "peertube-init-db.service" ]; ++ lib.optionals cfg.database.createLocally [ "postgresql.service" "peertube-init-db.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
@ -487,6 +493,10 @@ in {
extraConfig = '' extraConfig = ''
client_max_body_size 12G; client_max_body_size 12G;
add_header X-File-Maximum-Size 8G always; add_header X-File-Maximum-Size 8G always;
'' + lib.optionalString cfg.enableWebHttps ''
add_header Strict-Transport-Security 'max-age=63072000; includeSubDomains';
'' + lib.optionalString config.services.nginx.virtualHosts.${cfg.localDomain}.http3 ''
add_header Alt-Svc 'h3=":443"; ma=86400';
''; '';
}; };
@ -497,6 +507,10 @@ in {
extraConfig = '' extraConfig = ''
client_max_body_size 6M; client_max_body_size 6M;
add_header X-File-Maximum-Size 4M always; add_header X-File-Maximum-Size 4M always;
'' + lib.optionalString cfg.enableWebHttps ''
add_header Strict-Transport-Security 'max-age=63072000; includeSubDomains';
'' + lib.optionalString config.services.nginx.virtualHosts.${cfg.localDomain}.http3 ''
add_header Alt-Svc 'h3=":443"; ma=86400';
''; '';
}; };
@ -560,6 +574,10 @@ in {
priority = 1320; priority = 1320;
extraConfig = '' extraConfig = ''
add_header Cache-Control 'public, max-age=604800, immutable'; add_header Cache-Control 'public, max-age=604800, immutable';
'' + lib.optionalString cfg.enableWebHttps ''
add_header Strict-Transport-Security 'max-age=63072000; includeSubDomains';
'' + lib.optionalString config.services.nginx.virtualHosts.${cfg.localDomain}.http3 ''
add_header Alt-Svc 'h3=":443"; ma=86400';
''; '';
}; };
@ -718,6 +736,10 @@ in {
rewrite ^/static/webseed/(.*)$ /$1 break; rewrite ^/static/webseed/(.*)$ /$1 break;
''; '';
}; };
extraConfig = lib.optionalString cfg.enableWebHttps ''
add_header Strict-Transport-Security 'max-age=63072000; includeSubDomains';
'';
}; };
}; };