From 7df174e45cf1ab82ce14507da2b0ca93ff0aac91 Mon Sep 17 00:00:00 2001
From: Craige McWhirter <craige@mcwhirter.io>
Date: Tue, 28 Sep 2021 11:34:24 +1000
Subject: [PATCH] hydra: update Hydra configs

---
 profiles/hydra-dev.nix  | 2 ++
 profiles/hydra-fork.nix | 1 +
 profiles/hydra.nix      | 8 ++++----
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/profiles/hydra-dev.nix b/profiles/hydra-dev.nix
index d7a1152..a7da81e 100644
--- a/profiles/hydra-dev.nix
+++ b/profiles/hydra-dev.nix
@@ -5,6 +5,8 @@ let
     owner = "nixos";
     repo = "hydra";
     rev = "906d2493c5c74673ba317d0b5ce7d97b062bd39b";
+    #rev = "87837f1d82904bf48e11b5641258b6be2f663c3b";
+    #sha256 = "1vs3lyfyafsl7wbpmycv7c3n9n2rkrswp65msb6q1iskgpvr96d5";
     sha256 = "0i7szp04c873gfmj1h0dcl5rsbzzldc160pcls8z9v6iphils34i";
   };
 in
diff --git a/profiles/hydra-fork.nix b/profiles/hydra-fork.nix
index 6518b21..f4cb440 100644
--- a/profiles/hydra-fork.nix
+++ b/profiles/hydra-fork.nix
@@ -2,6 +2,7 @@
 
 let
   hydraRelease = (import (src + "/release.nix") {
+  #hydraRelease = (import src {
     nixpkgs = nixpkgsPath;
     hydraSrc = {
       outPath = src;
diff --git a/profiles/hydra.nix b/profiles/hydra.nix
index 84fadad..771e474 100644
--- a/profiles/hydra.nix
+++ b/profiles/hydra.nix
@@ -31,19 +31,19 @@
         name = "hydra";              # Ensure the database user persists
         ensurePermissions = {        # Ensure the database permissions persist
           "DATABASE hydra" = "ALL PRIVILEGES";
+          "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
         };
       }
     ];
   };
 
-  #networking.firewall.allowedTCPPorts = [ config.services.hydra-dev.port ];
   networking.firewall.allowedTCPPorts = [ config.services.hydra.port ];
 
   #services.hydra-dev = {
   services.hydra = {
     enable = true;
-    #package = pkgs.callPackage ./hydra-dev.nix {};  # Remove to use stable Hydra
-    package = pkgs.hydra-unstable;
+    #package = pkgs.hydra-unstable;
+    port = 3003;
     useSubstitutes = true;
     hydraURL = "https://hydra.mcwhirter.io";
     notificationSender = "hydra.mcwhirter.io";
@@ -58,7 +58,7 @@
     virtualHosts."hydra.mcwhirter.io" = {
       forceSSL = true;
       enableACME = true;
-      locations."/".proxyPass = "http://127.0.0.1:3000";
+      locations."/".proxyPass = "http://127.0.0.1:3003";
     };
   };