From b0d7c5173658b8cf773734d37ac980d27aee9cad Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Wed, 9 Aug 2023 19:56:30 +0100
Subject: [PATCH] gitlab: updated teh runners to have a token each as they
 should

---
 applications/gitlab_runner.nix      |  12 ++++++------
 secrets/gitlab/runners/runner01.age | Bin 730 -> 722 bytes
 secrets/gitlab/runners/runner02.age | Bin 0 -> 739 bytes
 secrets/secrets.nix                 |   1 +
 4 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 secrets/gitlab/runners/runner02.age

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 1744c77d0da6bb457324c77cd50dcc637ba1b659..81f1aca14ed751dc26224049fcd9eac7ce1a6bd7 100644
GIT binary patch
literal 722
zcmZ9_OKZ~r003Z7&=EZN4;GlRL)N8fle7Vm<<%zXV@=znO+_(D)4bX=%R5uNc$n<q
zWg?p%{09np5P!kcgI-ib5z&JPqM!#K2T{E4`vae98U@4CgWQkoxwkqGOgKS+!Wl3O
zt%5NwVHiSyGUBIg5}dWMAjjbm)f5!RmZT&R`P7%XvK<9|H>G$-uaAUTV3G<TFoUFS
z#ZuTb;Bu+1`KZp(BW#AV6UFcdre#N@TrQ5FqH=Hx_;i}2Af7WO-fBnite&`CGURi-
zHH)$yEkv$_XnLuXQ2pAxA=4tTDe|KU3~j_g7PoD)mUL0cn368W1#QL0yn!yI+O(0d
zG<tB`s2YN4f{h_n5mjY~4)MeytyI)|u3aX)mN;z)Jwq%zq+%7DyhXMEzoM{CMnH62
z&(%6P;QgM$$P<g!0~PBsr9NjNRe~C+8hdcdlOCa^pcmK5Ra+pSDB_27Nu$(3P2`g)
zY*VROvqs#crXwV)Agl{WrOLpu$W1jx^_XsrS&8@iCYQm3POi&ZyQC#!%QkET3;%DD
z8`C(Gu>~_Q)X)G$SWcNCxVl+@s;7YrVRUpoM2nalwWS=YMjl&7y@2tGDx7sY6G3Ro
z9gg7Xd8%?9CTz42!7Jt>#Tb?=0);{W<Q0UZ#){`w6vQ_j31Vj%Oj~tMXimm`8^W4$
z3_1L|7_$Jdf8wz7;N{ZKAKQ!PCpX`Y&yk-`J%4g?Zw<fo>*I~&&~W+o@w>mb9<Kbo
zPVLNwf41+uIlKQf<97BI<162H2m8D4)YnIb$R~Y^AeX)@yuiO+y{LV7#I0o4oO>6*
XZ^x$ZcaJ`%FRwjw?q6DvmtXw@v`6|{

literal 730
zcmZ9|OKZ~r007{N7jy7&*hLVc7dNw-rdgYYsVr@iHfxeTvOFEbG|QuF9!=8bb@2h}
z2EuS4?4}^%9}x87PJ%}T^&l#G*~x<kUnhs)alhb$PqU1I;pt&Eo(z5Of*)FNi~xnp
zU=-N}W4%-^BRD7`<AftXSa&EqAuZBX1<Y4F!vz$MOG<)Py=)qx3E%Gv`M5|{6AP&H
zJX+9ACm%B9uA=Fq8l!E**(B<ScqIv&xJPjji)LQV9@auSapDAwl~|3NM2AgDrlC#h
zwoK$?9nUGRCZ!ZtZ1>49Pgri9i~xd$)=8=s6!YaE(Qpstv-S$#3wTPg@qp@i_6o8R
zqP56V4r@WxShg(CbWD9ZCOK&!_F%X<wYyR}CMF0Jwq+f`T*z8Taz*W$EenvS4pJL5
zRfmy%2k*l%49UiTa+Ohu!!w>~*Q=t#(BzP|4r^J=<AVe=hLWG?Xzp`CUTk4{AO+Kw
z+j0X1<7KrH4OB?ZDIu>@B+!WAFt%6xu|<{~jd1JO80{#StQV(jt>=#hLz>|w9V&AF
zC($eV{L;DfQo#xhEi%9Yi26&Ts|uKNHES)U06WA`VIX31Q*v63-1J?E<W;lU=Uk=X
zuv)_{4pO_Cb4<lWnNcc~%9Gff5NtBa#mUeF42Ec=wnqbnLIGS5{SAy3Q?nmoa22nQ
zhIp5OG`TB6G}~l#X{sao#x%400<fL#K}U%FXS3g5-PpXl=gb|<Z~fltJUDZfUtE0j
z_{o@9o9pk+yg1(5L|&f$`sdrvi?g48e7Sk*-s;D{$4*E)pYNy#Gx6)L`22cQM&8fd
ge|qbkpnX_Hex2Wc%fAs|VCVKx>|}QB;r9OSKR6`*&;S4c

diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age
new file mode 100644
index 0000000000000000000000000000000000000000..241398043bb832a01637089bee59b68ea922e019
GIT binary patch
literal 739
zcmZ9|$%@lp003aolX1h7qKpJYEri;1Nt?{5Owu;fq-nZk`BT)Hq?7zzvb0UJ;!zM!
zb5KMPM7+3NJ*apWR0NNT3VIP=z?&d=oG19;)1jF)-QgmcEytdF-dn(2m`AdgP~RVA
z&Fum~<SA6i&mxgVD^1X3l&MfBFrg`jVBjs3X~)qFE2z{vc(ZC*uqQfPe%wO%a=c7O
z7Mbud#W?_`Y#5koOV%XLQuv-R76f6uLB#{LyIWguksU@T>=#)!WeHC!cYr!klZ_ER
z$zwxU!(%>IQ)ZRYFswKmxXmH1528UFMa?v>6u_wJYMd!swWhtaQw7>nn!-U5w#aba
z+O5q=lZOz+1xg#6o?K?;3JrM5#r1-N0YY?#22r2SVpDcG6~rnVAqiv}nxsnYpc1N#
zCyj><x76i99HwHg%|%*^=7=#2+z{WbC1Ia3B9vJ0+;+#xhkO#0YHeCIY$mD|F@mg1
zb*bF&U?`DQh^4?sDAqS=YdR&3s1N!gmL{~8Vl-ygY<B1{5xE#l34JJ=_WwyH3m2yD
zo9Go>N3D8>SVurx(E27VQ$^Nj7j(JqLN+G|MT6lxggK3<Ny`yAuTPTwQrB+-!O~f&
z$mATzZ&Y1FLNLZByP7bP3T+<P4Ku)X!PKoNrjcwmiw?-1ND8c+;!Hc4ENApMC<CE7
z@dYm_QsqK};Clj_t1jvg**Se}OZ@UYG~RzcaQr3l_RqTVasM&+Wd3ZeRNWF+ex6)y
z25*k6yng(3^ZK3qt6#y|)r`Hfdhfy0KSwuj?78sb!`{#H`#+5Csr!S6XV$Jhy8LbM
kwA4Lxd*2D=?8SGPyYa#A@BZ$4e>3yx@XBB3+^ygL0FY1meE<Le

literal 0
HcmV?d00001

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;