diff --git a/applications/gitlab_runner.nix b/applications/gitlab_runner.nix index 45186b0..b470701 100644 --- a/applications/gitlab_runner.nix +++ b/applications/gitlab_runner.nix @@ -47,8 +47,8 @@ pkgs.gitlab-runner ]; - age.secrets.runner_nix.file = ../secrets/gitlab/runners/runner01.age; - age.secrets.runner_general.file = ../secrets/gitlab/runners/runner01.age; + age.secrets.runner_01_nix.file = ../secrets/gitlab/runners/runner01.age; + age.secrets.runner_02_general.file = ../secrets/gitlab/runners/runner02.age; boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1 @@ -67,9 +67,9 @@ # might make a function later to have multiple runners, might never need it though runner_nix = { cloneUrl = cfg.runner.gitlab; - description = cfg.runner.description; + description = "For Nix only"; registrationFlags = [ "--docker-host" "tcp://127.0.0.1:2375" ]; - registrationConfigFile = config.age.secrets.runner_nix.path; + registrationConfigFile = config.age.secrets.runner_01_nix.path; dockerImage = cfg.runner.docker.image; # from https://nixos.wiki/wiki/Gitlab_runner @@ -106,9 +106,9 @@ runner_general = { cloneUrl = cfg.runner.gitlab; - description = cfg.runner.description; + description = "General Runner"; registrationFlags = [ "--docker-host" "tcp://127.0.0.1:2375" ]; - registrationConfigFile = config.age.secrets.runner_general.path; + registrationConfigFile = config.age.secrets.runner_02_general.path; dockerImage = cfg.runner.docker.image; }; }; diff --git a/secrets/gitlab/runners/runner01.age b/secrets/gitlab/runners/runner01.age index 1744c77..81f1aca 100644 Binary files a/secrets/gitlab/runners/runner01.age and b/secrets/gitlab/runners/runner01.age differ diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age new file mode 100644 index 0000000..2413980 Binary files /dev/null and b/secrets/gitlab/runners/runner02.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 827ac62..ab5f696 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -105,6 +105,7 @@ in "gitlab/ldap_pw.age".publicKeys = users ++ gitlab; "gitlab/runners/runner01.age".publicKeys = users ++ gitlab_runners; + "gitlab/runners/runner02.age".publicKeys = users ++ gitlab_runners; # for ldap "ldap/pw.age".publicKeys = users ++ ldap;