From dd4d8e3b001d56286da6b2615bf7c03af8037fec Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 30 Jul 2023 04:57:06 +0100 Subject: [PATCH] ci: testing a second runner for general use --- applications/gitlab_runner.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/applications/gitlab_runner.nix b/applications/gitlab_runner.nix index c2a1e52..9a5401b 100644 --- a/applications/gitlab_runner.nix +++ b/applications/gitlab_runner.nix @@ -47,7 +47,8 @@ pkgs.gitlab-runner ]; - age.secrets."${cfg.runner.name}".file = ../secrets/gitlab/runners/${cfg.runner.name}.age; + age.secrets.runner_nix.file = ../secrets/gitlab/runners/runner01.age; + age.secrets.runner_general.file = ../secrets/gitlab/runners/runner01.age; boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1 @@ -61,10 +62,10 @@ services = { # might make a function later to have multiple runners, might never need it though - "${cfg.runner.name}" = { + runner_nix = { cloneUrl = cfg.runner.gitlab; description = cfg.runner.description; - registrationConfigFile = config.age.secrets."${cfg.runner.name}".path; + registrationConfigFile = config.age.secrets.runner_nix.path; dockerImage = cfg.runner.docker.image; # from https://nixos.wiki/wiki/Gitlab_runner @@ -96,6 +97,14 @@ PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; }; + tagList = [ "nix" ]; + }; + + runner_general = { + cloneUrl = cfg.runner.gitlab; + description = cfg.runner.description; + registrationConfigFile = config.age.secrets.runner_general.path; + dockerImage = cfg.runner.docker.image; }; }; };