From 531060668a7bafe299c7e39f8bd63cd78266c3f4 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 15 May 2021 00:01:04 +0200 Subject: [PATCH] fuuko/hydra: Show logs after build is completed --- machines/fuuko/services/binary-cache.nix | 7 +++++++ machines/fuuko/services/hydra.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/machines/fuuko/services/binary-cache.nix b/machines/fuuko/services/binary-cache.nix index 9ef711a..d932605 100644 --- a/machines/fuuko/services/binary-cache.nix +++ b/machines/fuuko/services/binary-cache.nix @@ -51,6 +51,13 @@ in auth_basic "restricted upload"; auth_basic_user_file ${config.sops.secrets.nix-binary-cache-htpasswd.path}; } + + # workaround for nginx dropping parent headers + # see https://github.com/yandex/gixy/blob/master/docs/en/plugins/addheaderredefinition.md + ${lib.concatStringsSep "\n" (lib.filter + (lib.hasPrefix "add_header ") + (lib.splitString "\n" config.services.nginx.commonHttpConfig))} + add_header Access-Control-Allow-Origin https://hydra.sbruder.de; ''; "/nix/store/".proxyPass = "http://localhost:${config.systemd.services.nar-serve.environment.PORT}"; }; diff --git a/machines/fuuko/services/hydra.nix b/machines/fuuko/services/hydra.nix index 6421322..87e4a2d 100644 --- a/machines/fuuko/services/hydra.nix +++ b/machines/fuuko/services/hydra.nix @@ -25,6 +25,7 @@ in server_store_uri = file:///data/cache/nix-binary-cache upload_logs_to_binary_cache = true + log_prefix = https://nix-cache.sbruder.de/ ''; };