lib/flake-helper.nix: Use fqdn as target host for colmena

hosts/hydra-1,hosts/hydra-2: Allow git via http in restricted mode
2024-04-08 08:17:19 +02:00 · 2024-04-08 08:16:29 +02:00
3 changed files with 3 additions and 3 deletions
--- a/hosts/hydra-1/configuration.nix
+++ b/hosts/hydra-1/configuration.nix
@ -26,7 +26,7 @@
  networking.nameservers = [ "2001:638:904:ffcc::3" "2001:638:904:ffcc::4" "141.24.40.3" "141.24.40.4" ];
  nix = {
-    settings.allowed-uris = "http: https: github:";
+    settings.allowed-uris = "http: https: git+https: github:";
    distributedBuilds = true;
    buildMachines = [
      {
--- a/hosts/hydra-2/configuration.nix
+++ b/hosts/hydra-2/configuration.nix
@ -26,7 +26,7 @@
  networking.nameservers = [ "2001:638:904:ffcc::3" "2001:638:904:ffcc::4" "141.24.40.3" "141.24.40.4" ];
  # Allow Hydra to fetch remote URLs in restricted mode
-  nix.settings.allowed-uris = "http: https: github:";
+  nix.settings.allowed-uris = "http: https: git+https: github:";
  services.openssh.settings= {
   PermitRootLogin = "yes";
--- a/lib/flake-helper.nix
+++ b/lib/flake-helper.nix
@ -57,7 +57,7 @@ rec {
  generateColmenaHost = name: hostSystem: {
    deployment = {
-      targetHost = "${name}.net.clerie.de";
+      targetHost = hostSystem.config.networking.fqdn;
      targetUser = null;
      tags = let
        group = nixpkgs.lib.attrByPath [ "clerie" "monitoring" "serviceLevel" ] null hostSystem.config;
Author	SHA1	Message	Date
clerie	db61a104ff	lib/flake-helper.nix: Use fqdn as target host for colmena	2024-04-08 08:17:19 +02:00
clerie	128f2360c7	hosts/hydra-1,hosts/hydra-2: Allow git via http in restricted mode	2024-04-08 08:16:29 +02:00