Compare commits

..
4 changed files with 6 additions and 32 deletions

6
flake.lock generated
View file

@ -40,11 +40,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1794819152,
"narHash": "sha256-a7ymvqbsg5NlcTrtJLF26UqbfLFNiHpxnaE9em5NzT8=",
"lastModified": 1794756927,
"narHash": "sha256-IfuPcOpwC+bYvBdtUhA9hHhY7xV7k9T5LeOTZFiJB4o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c089fab3b46743911df4c60199f6d0b20c4fb834",
"rev": "b349185bb79c7cf7ad8ea8c097931730bf473c71",
"type": "github"
},
"original": {

View file

@ -87,7 +87,6 @@
};
};
}
./modules/overlays/urllib3-future.nix
./hosts/www
];
};

View file

@ -23,9 +23,7 @@ in
enableACME = true;
extraConfig = ''
add_header Strict-Transport-Security max-age=15768000;
error_log syslog:server=unix:/dev/log,tag=${
builtins.replaceStrings [ "." ] [ "_" ] "mta-sts.${config.networking.domain}"
} warn;
error_log syslog:server=unix:/dev/log,tag=${builtins.replaceStrings [ "." ] [ "_" ] "mta-sts.${config.networking.domain}"} warn;
access_log syslog:server=unix:/dev/log vhost_combined;
'';
locations."= /.well-known/mta-sts.txt" = {
@ -45,9 +43,7 @@ in
extraConfig = ''
# HSTS (ngx_http_headers_module is required) (15768000 seconds = 6 months)
add_header Strict-Transport-Security max-age=15768000;
error_log syslog:server=unix:/dev/log,tag=${
builtins.replaceStrings [ "." ] [ "_" ] "www.${config.networking.domain}"
} warn;
error_log syslog:server=unix:/dev/log,tag=${builtins.replaceStrings [ "." ] [ "_" ] "www.${config.networking.domain}"} warn;
access_log syslog:server=unix:/dev/log vhost_combined;
'';
locations = {
@ -113,9 +109,7 @@ in
forceSSL = true;
enableACME = true;
extraConfig = ''
error_log syslog:server=unix:/dev/log,tag=${
builtins.replaceStrings [ "." ] [ "_" ] "staging.${config.networking.domain}"
} warn;
error_log syslog:server=unix:/dev/log,tag=${builtins.replaceStrings [ "." ] [ "_" ] "staging.${config.networking.domain}"} warn;
access_log syslog:server=unix:/dev/log vhost_combined;
'';
locations = {

View file

@ -1,19 +0,0 @@
{ ... }:
{
nixpkgs.overlays = [
(final: prev: {
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
(python-final: python-prev: {
urllib3-future = python-prev.urllib3-future.overridePythonAttrs (oldAttrs: {
disabledTestPaths = (oldAttrs.disabledTestPaths or [ ]) ++ [
"test/test_async_response.py::TestAsyncResponse::test_chunked_decoding_gzip_swallow_garbage"
"test/test_response.py::TestResponse::test_chunked_decoding_gzip_swallow_garbage"
"test/test_ssltransport.py::SingleTLSLayerTestCase::test_start_closed_socket"
];
});
})
];
})
];
}