mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-27 08:04:14 +00:00
4f0dadbf38
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
63 lines
2.2 KiB
Nix
63 lines
2.2 KiB
Nix
let
|
|
dst-dir = "/run/nginx-test-tmpdir-uploads";
|
|
in
|
|
import ./make-test-python.nix {
|
|
name = "nginx-tmpdir";
|
|
|
|
nodes.machine =
|
|
{ pkgs, ... }:
|
|
{
|
|
environment.etc."tmpfiles.d/nginx-uploads.conf".text = "d ${dst-dir} 0755 nginx nginx 1d";
|
|
|
|
# overwrite the tmp.conf with a short age, there will be a duplicate line info from systemd-tmpfiles in the log
|
|
systemd.tmpfiles.rules = [
|
|
"q /tmp 1777 root root 1min"
|
|
];
|
|
|
|
services.nginx.enable = true;
|
|
# simple upload service using the nginx client body temp path
|
|
services.nginx.virtualHosts = {
|
|
localhost = {
|
|
locations."~ ^/upload/([0-9a-zA-Z-.]*)$" = {
|
|
extraConfig = ''
|
|
alias ${dst-dir}/$1;
|
|
client_body_in_file_only clean;
|
|
dav_methods PUT;
|
|
create_full_put_path on;
|
|
dav_access group:rw all:r;
|
|
'';
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
testScript = ''
|
|
machine.wait_for_unit("nginx")
|
|
machine.wait_for_open_port(80)
|
|
|
|
with subtest("Needed prerequisite --http-client-body-temp-path=/tmp/nginx_client_body and private temp"):
|
|
machine.succeed("touch /tmp/systemd-private-*-nginx.service-*/tmp/nginx_client_body")
|
|
|
|
with subtest("Working upload of test setup"):
|
|
machine.succeed("curl -X PUT http://localhost/upload/test1 --fail --data-raw 'Raw data 1'")
|
|
machine.succeed('test "$(cat ${dst-dir}/test1)" = "Raw data 1"')
|
|
|
|
# let the tmpfiles clean service do its job
|
|
machine.succeed("touch /tmp/touched")
|
|
machine.wait_until_succeeds(
|
|
"sleep 15 && systemctl start systemd-tmpfiles-clean.service && [ ! -f /tmp/touched ]",
|
|
timeout=150
|
|
)
|
|
|
|
with subtest("Working upload after cleaning"):
|
|
machine.succeed("curl -X PUT http://localhost/upload/test2 --fail --data-raw 'Raw data 2'")
|
|
machine.succeed('test "$(cat ${dst-dir}/test2)" = "Raw data 2"')
|
|
|
|
# manually remove the nginx temp dir
|
|
machine.succeed("rm -r --interactive=never /tmp/systemd-private-*-nginx.service-*/tmp/nginx_client_body")
|
|
|
|
with subtest("Broken upload after manual temp dir removal"):
|
|
machine.fail("curl -X PUT http://localhost/upload/test3 --fail --data-raw 'Raw data 3'")
|
|
'';
|
|
}
|