From 13688e364f347f26606801ad74d2ade802e04eaa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Aug 2012 16:31:25 +0000 Subject: [PATCH] Add a binary-cache-url file to channels to advertise the binary cache URL --- src/lib/Hydra/Base/Controller/NixChannel.pm | 8 ++++++++ src/lib/Hydra/Controller/Root.pm | 1 + 2 files changed, 9 insertions(+) diff --git a/src/lib/Hydra/Base/Controller/NixChannel.pm b/src/lib/Hydra/Base/Controller/NixChannel.pm index f07dab1e..3d013539 100644 --- a/src/lib/Hydra/Base/Controller/NixChannel.pm +++ b/src/lib/Hydra/Base/Controller/NixChannel.pm @@ -86,6 +86,14 @@ sub nixexprs : Chained('nix') PathPart('nixexprs.tar.bz2') Args(0) { } +sub binary_cache_url : Chained('nix') PathPart('binary-cache-url') Args(0) { + my ($self, $c) = @_; + $c->stash->{'plain'} = { data => $c->uri_for('/') }; + $c->header('Content-Type' => 'text/plain'); + $c->forward('Hydra::View::Plain'); +} + + sub name { my ($build) = @_; return $build->releasename || $build->nixname; diff --git a/src/lib/Hydra/Controller/Root.pm b/src/lib/Hydra/Controller/Root.pm index cfe02008..c0bbc320 100644 --- a/src/lib/Hydra/Controller/Root.pm +++ b/src/lib/Hydra/Controller/Root.pm @@ -198,6 +198,7 @@ sub nar :Local :Args(1) { sub nix_cache_info :Path('nix-cache-info') :Args(0) { my ($self, $c) = @_; + $c->header('Content-Type' => 'text/plain'); $c->stash->{'plain'} = { data => #"StoreDir: $Nix::Config::storeDir\n" . # FIXME "StoreDir: /nix/store\n" .