From 5e182a36f16573210aa3fc78c7457bcab4cf65f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 16 Dec 2023 16:23:14 +0100
Subject: [PATCH] Drop hydra-ca

---
 hosts/hydra/default.nix               | 85 ---------------------------
 hosts/public-access-proxy/default.nix |  1 -
 2 files changed, 86 deletions(-)

diff --git a/hosts/hydra/default.nix b/hosts/hydra/default.nix
index b1fae62c..322dadf1 100644
--- a/hosts/hydra/default.nix
+++ b/hosts/hydra/default.nix
@@ -101,89 +101,10 @@ in
     '';
   };
 
-  containers = {
-    # hydra-binfmt-builder = {
-    #   autoStart = true;
-    #   config = { ... }: {
-    #     imports = [ (modulesPath + "/profiles/minimal.nix") ];
-
-    #     networking.firewall.allowedTCPPorts = [ 22 ];
-
-    #     nix = {
-    #       settings = config.nix.settings;
-    #       extraOptions = config.nix.extraOptions;
-    #     };
-
-    #     services.openssh.enable = true;
-
-    #     system.stateVersion = "22.11";
-
-    #     users.users."root".openssh.authorizedKeys.keys = [
-    #       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBga6vW8lnbFKl+Yd2xBiF71FRyV14eDUnqcMc2AWifI root@hydra"
-    #     ];
-    #   };
-    #   hostAddress = "192.168.100.1";
-    #   localAddress = "192.168.100.3";
-    #   privateNetwork = true;
-    # };
-
-  #   disabled because currently it display `ARRAY(0x4ec2040)` on the website and also uses a perl array in store paths instead of /nix/store
-  #   hydra-ca = {
-  #     autoStart = true;
-  #     config = { ... }: {
-  #       imports = [
-  #         hydra-ca.nixosModules.hydra
-  #       ];
-
-  #       environment.systemPackages = with pkgs; [ git ];
-
-  #       networking.firewall.allowedTCPPorts = [ 3001 ];
-
-  #       nix = {
-  #         settings = {
-  #           allowed-uris = "https://gitea.c3d2.de/ https://github.com/ https://gitlab.com/ ssh://gitea@gitea.c3d2.de/";
-  #           builders-use-substitutes = true;
-  #           experimental-features = "ca-derivations nix-command flakes";
-  #           extra-substituters = "https://cache.ngi0.nixos.org/";
-  #           extra-trusted-public-keys = "cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA=";
-  #           substituters = [
-  #             "https://cache.ngi0.nixos.org/"
-  #           ];
-  #           trusted-public-keys = [
-  #             "cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA="
-  #           ];
-  #         };
-  #       };
-
-  #       nixpkgs = {
-  #         # config.contentAddressedByDefault = true;
-  #         overlays = [ self.overlay ];
-  #       };
-
-  #       services = {
-  #         hydra-dev = lib.recursiveUpdate config.services.hydra-dev {
-  #           hydraURL = "https://hydra-ca.hq.c3d2.de";
-  #           port = 3001;
-  #         };
-  #       };
-
-  #       system.stateVersion = "22.05"; # Did you read the comment? No.
-  #     };
-  #     hostAddress = "192.168.100.1";
-  #     localAddress = "192.168.100.2";
-  #     privateNetwork = true;
-  #   };
-  };
-
   networking = {
     hostId = "3f0c4ec4";
     hostName = "hydra";
     nameservers = [ "172.20.73.8" "9.9.9.9" ];
-    # nat = {
-    #   enable = true;
-    #   externalInterface = "serv";
-    #   internalInterfaces = [ "ve-hydra-biLqAU" ];
-    # };
   };
 
   programs.ssh.knownHosts = lib.mkMerge [
@@ -255,15 +176,9 @@ in
           forceSSL = true;
           locations."/".proxyPass = "http://127.0.0.1:${toString config.services.hydra.port}";
           serverAliases = [
-            "hydra-ca.hq.c3d2.de"
             "hydra.serv.zentralwerk.org"
           ];
         };
-        # "hydra-ca.hq.c3d2.de" = {
-        #   enableACME = true;
-        #   forceSSL = true;
-        #   locations."/".proxyPass = "http://192.168.100.2:3001";
-        # };
         "nix-cache.hq.c3d2.de" = {
           forceSSL = true;
           enableACME = true;
diff --git a/hosts/public-access-proxy/default.nix b/hosts/public-access-proxy/default.nix
index 16cd5ad1..ffae10e3 100644
--- a/hosts/public-access-proxy/default.nix
+++ b/hosts/public-access-proxy/default.nix
@@ -88,7 +88,6 @@
     } {
       hostNames = [
         "hydra.hq.c3d2.de"
-        "hydra-ca.hq.c3d2.de"
         "nix-cache.hq.c3d2.de"
         "nix-serve.hq.c3d2.de"
       ];