From 84e7a380240e07c24467520c2e97d96a65def776 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 20 Jan 2020 16:48:20 +0100
Subject: [PATCH] Hail fixup

---
 hosts/hydra/hydra.nix | 28 ++++++++++++----------------
 lib/default.nix       |  3 +--
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/hosts/hydra/hydra.nix b/hosts/hydra/hydra.nix
index d223140c..37d1cc84 100644
--- a/hosts/hydra/hydra.nix
+++ b/hosts/hydra/hydra.nix
@@ -5,15 +5,13 @@
     binaryCaches = [ "https://cache.nixos.org" "https://cache.dhall-lang.org" ];
     binaryCachePublicKeys =
       [ "cache.dhall-lang.org:I9/H18WHd60olG5GsIjolp7CtepSgJmM2CsO813VTmM=" ];
-    buildMachines = [
-      {
-        hostName = "server7.hq.c3d2.de";
-        system = "x86_64-linux";
-        sshUser = "buildfarmer";
-        sshKey = "/root/.ssh/id_ed25519";
-        maxJobs = 10;
-      }
-    ];
+    buildMachines = [{
+      hostName = "server7.hq.c3d2.de";
+      system = "x86_64-linux";
+      sshUser = "buildfarmer";
+      sshKey = "/root/.ssh/id_ed25519";
+      maxJobs = 10;
+    }];
     extraOptions = ''
       allowed-uris = http:// https://
     '';
@@ -31,13 +29,11 @@
     enable = true;
     recommendedProxySettings = true;
     recommendedGzipSettings = true;
-    virtualHosts = {
-      "hydra.hq.c3d2.de" = {
-        forceSSL = true;
-        enableACME = true;
-        locations."/".proxyPass =
-          "http://localhost:${toString config.services.hydra.port}";
-      };
+    virtualHosts."hydra.hq.c3d2.de" = {
+      forceSSL = true;
+      enableACME = true;
+      locations."/".proxyPass =
+        "http://localhost:${toString config.services.hydra.port}";
     };
   };
 }
diff --git a/lib/default.nix b/lib/default.nix
index e6105740..906c8a33 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -218,8 +218,7 @@ in {
     services.hail = lib.mkIf cfg.enableHail {
       enable = true;
       hydraJobUri =
-        let hydra = if cfg.mapHqHosts then "hydra.hq" else "hydra.hq.c3d2.de";
-        in "https:///${hydra}/job/c3d2/hail/${config.networking.hostName}-activator ";
+        "https://hydra.hq.c3d2.de/job/c3d2/hail/${config.networking.hostName}-activator ";
       # pad the end so the URL doesn't break when systemshit puts a ; on the end
       package = (import <nixpkgs-unstable> { }).haskellPackages.hail;
       # Only builds > 19.09