grahamc/hydra - Change 2V4M2M2RZ5R6I55UIFKRMONPEGBA5FQ7ZB6HM6LHF255AX4JCXXAC

Use "nix cat-store" to serve files from the Nix store

This makes downloading/viewing build results work with binary cache stores. For good performance, this should be used in conjunction with https://github.com/NixOS/nix/commit/ca580bec35ea4d1984e36864158d7be99cfcb34b, i.e. you should set store_uri to something like

s3://my-cache?local-nar-cache=/tmp/nar-cache

to cache NARs between requests.

Created by Eelco Dolstra on October 18, 2017

2V4M2M2RZ5R6I55UIFKRMONPEGBA5FQ7ZB6HM6LHF255AX4JCXXAC

Dependencies

In channels

main

upstream

Change contents

Deletion in src/lib/Hydra/Controller/Build.pm at line 206 [4.1]
∅:D[3.129] → [4.2572:2573]
∅:D[2.332] → [4.2572:2573]
∅:D[5.458] → [4.2572:2573]
∅:D[6.1176] → [4.2572:2573]
B:BD[4.2572] → [4.2572:2573]
B:BD[2.1346] → [2.1346:1436]
```
    notFound($c, "File " . $product->path . " does not exist.") unless -e $product->path;
```
Replacement in src/lib/Hydra/Controller/Build.pm at line 222 [4.1]
B:BD[7.352] → [7.352:398]
B:BD[7.398] → [8.171:212]
```
    # Make sure the file is in the Nix store.
    $path = checkPath($self, $c, $path);
```
[7.352]
[4.2908]
```
    if (isLocalStore) {
```

Replacement in src/lib/Hydra/Controller/Build.pm at line 224 [4.1]

B:BD[4.2909] → [4.2909:3100]

    # If this is a directory but no "/" is attached, then redirect.
    if (-d $path && substr($c->request->uri, -1) ne "/") {
        return $c->res->redirect($c->request->uri . "/");
    }

[4.2909]

[9.599]

        notFound($c, "File " . $product->path . " does not exist.") unless -e $product->path;

Replacement in src/lib/Hydra/Controller/Build.pm at line 226 [4.1]

∅:D[9.600] → [4.3105:3174]

B:BD[4.3105] → [4.3105:3174]

    $path = "$path/index.html" if -d $path && -e "$path/index.html";

[9.600]

[4.3174]

        # Make sure the file is in the Nix store.
        $path = checkPath($self, $c, $path);

Replacement in src/lib/Hydra/Controller/Build.pm at line 229 [4.1]

B:BD[4.3175] → [6.1344:1405]

    notFound($c, "File $path does not exist.") if !-e $path;

[4.3175]

[10.233]

        # If this is a directory but no "/" is attached, then redirect.
        if (-d $path && substr($c->request->uri, -1) ne "/") {
            return $c->res->redirect($c->request->uri . "/");
        }

Replacement in src/lib/Hydra/Controller/Build.pm at line 234 [4.1]

B:BD[10.234] → [10.234:294]

    notFound($c, "Path $path is a directory.") if -d $path;

[10.234]

[4.3258]

        $path = "$path/index.html" if -d $path && -e "$path/index.html";
        notFound($c, "File $path does not exist.") if !-e $path;
        notFound($c, "Path $path is a directory.") if -d $path;
        $c->serve_static_file($path);
        $c->response->headers->last_modified($c->stash->{build}->stoptime);

Replacement in src/lib/Hydra/Controller/Build.pm at line 243 [4.1]

B:BD[4.3259] → [4.3259:3293]

B:BD[4.3293] → [11.625:697]

    $c->serve_static_file($path);
    $c->response->headers->last_modified($c->stash->{build}->stoptime);

[4.3259]

[12.774]

    } else {
        $c->stash->{'plain'} = { data => readNixFile($path) };
        $c->response->content_type('application/octet-stream');
        $c->forward('Hydra::View::Plain');
    }