From 92920ebabd11f2060e2368edadd58235ecd2456e Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 2 Jan 2021 20:14:09 +0100 Subject: [PATCH] Fixup --- hosts/pruflas/default.nix | 3 +-- hosts/surgat/default.nix | 12 ++++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/hosts/pruflas/default.nix b/hosts/pruflas/default.nix index e2e6613..9f8b50a 100644 --- a/hosts/pruflas/default.nix +++ b/hosts/pruflas/default.nix @@ -13,8 +13,7 @@ in services.hydra = { enable = true; - hydraURL = "hydra.dadada.li"; - package = pkgs.hydra-unstable; + hydraURL = "https://hydra.dadada.li"; notificationSender = "hydra@localhost"; buildMachinesFiles = [ ]; useSubstitutes = true; diff --git a/hosts/surgat/default.nix b/hosts/surgat/default.nix index d80caca..f52f6b4 100644 --- a/hosts/surgat/default.nix +++ b/hosts/surgat/default.nix @@ -22,12 +22,16 @@ in enableACME = true; forceSSL = true; + root = "${pkgs.nginx}/html"; + locations."/".extraConfig = '' - proxy_pass http://10.3.3.3:3000; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Server $host; proxy_redirect http://10.3.3.3:3000 https://hydra.dadada.li; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; + proxy_redirect https://10.3.3.3:3000 https://hydra.dadada.li; + proxy_pass http://10.3.3.3:3000; ''; };