From c182071080957f6dfe66f7ea563b231c30efdfbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Sat, 4 Jan 2025 17:41:25 +0100 Subject: [PATCH] treewide: disable hercules and github-runner modules --- hosts/kazuki/default.nix | 9 ------ hosts/kogata/default.nix | 6 ---- hosts/legion/default.nix | 8 ----- hosts/ude/default.nix | 9 ------ modules/system/settei/hercules.nix | 47 ++++++++++++++---------------- 5 files changed, 22 insertions(+), 57 deletions(-) diff --git a/hosts/kazuki/default.nix b/hosts/kazuki/default.nix index 77f3e3c..1b099f7 100644 --- a/hosts/kazuki/default.nix +++ b/hosts/kazuki/default.nix @@ -42,14 +42,5 @@ routes = [ { Gateway = "fe80::1"; } ]; }; networking.useNetworkd = true; - - common.hercules.enable = true; - common.github-runner = { - enable = true; - runners.settei = { - url = "https://github.com/nrabulinski/settei"; - instances = 2; - }; - }; }; } diff --git a/hosts/kogata/default.nix b/hosts/kogata/default.nix index d6906ec..ca479dc 100644 --- a/hosts/kogata/default.nix +++ b/hosts/kogata/default.nix @@ -15,11 +15,5 @@ ipv4 = "100.102.13.61"; ipv6 = "fd7a:115c:a1e0::e126:d3d"; }; - - common.hercules.enable = true; - common.github-runner = { - enable = true; - runners.settei.url = "https://github.com/nrabulinski/settei"; - }; }; } diff --git a/hosts/legion/default.nix b/hosts/legion/default.nix index d293523..baa53f4 100644 --- a/hosts/legion/default.nix +++ b/hosts/legion/default.nix @@ -41,14 +41,6 @@ age.secrets.niko-pass.file = ../../secrets/legion-niko-pass.age; users.users.${username}.hashedPasswordFile = config.age.secrets.niko-pass.path; - common.hercules.enable = true; - common.github-runner = { - enable = true; - runners.settei = { - url = "https://github.com/nrabulinski/settei"; - instances = 4; - }; - }; common.incus.enable = true; virtualisation.podman.enable = true; }; diff --git a/hosts/ude/default.nix b/hosts/ude/default.nix index 76026d2..bbf8506 100644 --- a/hosts/ude/default.nix +++ b/hosts/ude/default.nix @@ -25,15 +25,6 @@ ipv6 = "fd7a:115c:a1e0:ab12:4843:cd96:6276:2a8b"; }; - common.hercules.enable = true; - services.hercules-ci-agent.settings.concurrentTasks = 6; - common.github-runner = { - enable = true; - runners.settei = { - url = "https://github.com/nrabulinski/settei"; - instances = 6; - }; - }; common.incus.enable = true; virtualisation.podman.enable = true; diff --git a/modules/system/settei/hercules.nix b/modules/system/settei/hercules.nix index 9762094..ff18f00 100644 --- a/modules/system/settei/hercules.nix +++ b/modules/system/settei/hercules.nix @@ -20,31 +20,28 @@ in inherit options; - config = - lib.mkIf false - # config.common.hercules.enable - { - age.secrets.hercules-token = { - file = ../../../secrets/hercules-token.age; - owner = herculesUser; - }; - age.secrets.hercules-cache = { - file = ../../../secrets/hercules-cache.age; - owner = herculesUser; - }; - age.secrets.hercules-secrets = { - file = ../../../secrets/hercules-secrets.age; - owner = herculesUser; - }; + config = lib.mkIf config.common.hercules.enable { + age.secrets.hercules-token = { + file = ../../../secrets/hercules-token.age; + owner = herculesUser; + }; + age.secrets.hercules-cache = { + file = ../../../secrets/hercules-cache.age; + owner = herculesUser; + }; + age.secrets.hercules-secrets = { + file = ../../../secrets/hercules-secrets.age; + owner = herculesUser; + }; - services.hercules-ci-agent = { - enable = true; - settings = { - clusterJoinTokenPath = config.age.secrets.hercules-token.path; - concurrentTasks = lib.mkDefault 4; - binaryCachesPath = config.age.secrets.hercules-cache.path; - secretsJsonPath = config.age.secrets.hercules-secrets.path; - }; - }; + services.hercules-ci-agent = { + enable = true; + settings = { + clusterJoinTokenPath = config.age.secrets.hercules-token.path; + concurrentTasks = lib.mkDefault 4; + binaryCachesPath = config.age.secrets.hercules-cache.path; + secretsJsonPath = config.age.secrets.hercules-secrets.path; }; + }; + }; }