From 2d45cb826b79969c28189c28e81277c52cf08dd2 Mon Sep 17 00:00:00 2001 From: clerie Date: Mon, 22 Apr 2024 20:42:23 +0200 Subject: [PATCH] hosts/hydra-1: Move hydra config to seperate file --- hosts/hydra-1/configuration.nix | 23 ++--------------------- hosts/hydra-1/hydra.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 21 deletions(-) create mode 100644 hosts/hydra-1/hydra.nix diff --git a/hosts/hydra-1/configuration.nix b/hosts/hydra-1/configuration.nix index 43298de..dbf07a8 100644 --- a/hosts/hydra-1/configuration.nix +++ b/hosts/hydra-1/configuration.nix @@ -6,6 +6,8 @@ ./hardware-configuration.nix ../../configuration/proxmox-vm ../../configuration/hydra-build-machine + + ./hydra.nix ]; boot.loader.grub.enable = true; @@ -57,18 +59,6 @@ programs.ssh.knownHosts."hydra-1.net.clerie.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE2xQBCsFBCwL9n4OP/bPngtNO1fy9kPw13Z/NDoba16 root@hydra-1"; programs.ssh.knownHosts."hydra-2.net.clerie.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDZED9QM+qe7sB6R6atvP6WNaI2sC2nh7TTsD6kgRpnr root@hydra-2"; - services.hydra = { - enable = true; - port = 3001; - hydraURL = "https://hydra.clerie.de"; - listenHost = "localhost"; - notificationSender = "noreply@hydra.clerie.de"; - useSubstitutes = true; - extraConfig = '' - binary_cache_public_uri = https://nix-cache.clerie.de - ''; - }; - services.harmonia = { enable = true; settings.bind = "[::1]:5005"; @@ -77,15 +67,6 @@ services.nginx.enable = true; services.nginx.virtualHosts = { - "hydra.clerie.de" = { - enableACME = true; - forceSSL = true; - locations = { - "/" = { - proxyPass = "http://localhost:3001"; - }; - }; - }; "nix-cache.clerie.de" = { enableACME = true; forceSSL = true; diff --git a/hosts/hydra-1/hydra.nix b/hosts/hydra-1/hydra.nix new file mode 100644 index 0000000..1ab8fee --- /dev/null +++ b/hosts/hydra-1/hydra.nix @@ -0,0 +1,28 @@ +{ ... }: + +{ + services.hydra = { + enable = true; + port = 3001; + hydraURL = "https://hydra.clerie.de"; + listenHost = "localhost"; + notificationSender = "noreply@hydra.clerie.de"; + useSubstitutes = true; + extraConfig = '' + binary_cache_public_uri = https://nix-cache.clerie.de + ''; + }; + + services.nginx.virtualHosts = { + "hydra.clerie.de" = { + enableACME = true; + forceSSL = true; + locations = { + "/" = { + proxyPass = "http://localhost:3001"; + }; + }; + }; + }; + +}