.sops.yaml

@@ -19,7 +19,3 @@ creation_rules:
     key_groups:
       - age:
           - *notoh
-  - path_regex: secrets/runners/[^/]+\.yaml$
-    key_groups:
-      - age:
-          - *notoh

hosts/tsuru/services/forgejo-runners.nix

@@ -4,15 +4,9 @@
   ...
 }: {
   sops.secrets = {
-    snowflake-runner-token = {
+    snowflake-runner-token = {};
-      sopsFile = ../../../secrets/runners/secrets.yaml;
+    basegbot-runner-token = {};
-    };
+    nixgarden-runner-token = {};
-    basegbot-runner-token = {
-      sopsFile = ../../../secrets/runners/secrets.yaml;
-    };
-    notohh-dev-runner-token = {
-      sopsFile = ../../../secrets/runners/secrets.yaml;
-    };
   };
   services.gitea-actions-runner = {
     package = pkgs.forgejo-actions-runner;
@@ -62,7 +56,7 @@
         gitMinimal
       ];
     };
-    instances.notohh-dev = {
+    instances.nix-garden = {
       settings = {
         container = {
           network = "host";
@@ -70,7 +64,7 @@
       };
       enable = true;
       name = config.networking.hostName;
-      token = config.sops.secrets.notohh-dev-runner-token.path;
+      token = config.sops.secrets.nixgarden-runner-token.path;
       url = "https://git.flake.sh";
       labels = [
         "debian-latest:docker://node:18-bullseye"

secrets/runners/secrets.yaml

@@ -1,23 +0,0 @@
-snowflake-runner-token: ENC[AES256_GCM,data:gDOYwj/gMvVRkjquGycYAprE0vt0dwNqMPkOmMS87mJpYnzi/492XQ==,iv:yHS3aa8oooUnb7I1vnJ+OmiscVSRp9zn0rx1dlVqOPE=,tag:T0hyEQBnvE51pV9dizODxg==,type:str]
-basegbot-runner-token: ENC[AES256_GCM,data:qzM8bHr0ZEvzQVPFllurCvUnJ5Y68UGTdGt+ap5GdsLVt99MXN8RuQ==,iv:qkruEo3ak9bx5CdIHRXBUofc5P5YchfFSM4oQljJrDQ=,tag:PBuASIC5RdpUXFz9RotfiQ==,type:str]
-notohh-dev-runner-token: ENC[AES256_GCM,data:6UPwZm5s2CnZ7sQkZpkkFdxBkpzY5KzsTuMMOiLnGiFS55QcH1MJqg==,iv:1DMoxaJ1AYOdG3dwt3zZFVjkT9wZLs3MilXT+o2eE8o=,tag:vCqcxLmxh1wiHAkLNSmkNw==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age1ckvmyqkwk69j64ev3fmckytz6k2dv79z4gn5qf6gxqyevp5yjfesdfkxmn
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBVU1hKVEwxZmExcmlPeUlk
-            NS9lSm1pYTFaYW10TFIwanhLQUVPclR0NWxBCkM2WnlscENDU25KbHk2NlF6OFNa
-            VmVjcmtWZjcxSFRRRXg1VzA5Mk92VTgKLS0tIGhGWWlGREdHOTdGV3UyTTdRSUlt
-            dHZqR08yMlh0MW9TS3VMTTlPeXVCTlkKvPQkdIG7XnM/6R3f7tfMx90dn3heBFUP
-            hN7/ZT9fRr3yegHHsnA+mbwsLH47kBfY70WKHqm0f8TZBY7y1cfF9g==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-01-16T06:46:03Z"
-    mac: ENC[AES256_GCM,data:1loHXvTxzucT8tTqxfMfKqj3uKGTn2UsZEirLFkz8QaXDah5Kx7f8LDCywLp/vWDUm3JdHXBpWbb6rrhp/yHkF9bEF6JCK/Qvo+ZutzbRJWRoI4d74V2mA6Y8zy2+0B4vVPWjaHaC+PBCsDozoeSkWuMU+HCISmqDl+I9F9v3VQ=,iv:povwVuJ8Y/DzakHgZvCHC5O5bjWcrNpK8aT84EqjFfE=,tag:hFdCYJqS/w/WfGSzvxHddw==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.8.1

secrets/secrets.yaml

@@ -4,6 +4,9 @@ cloudflare-api-key: ENC[AES256_GCM,data:ZEYzFht24xogGov/Dkk9MQm0CZ/GPHvVgC7manQ2
 gluetun: ENC[AES256_GCM,data:yL+LOPpwU+CAtbjc7YWbNUOTpDhq4mH3aJOl3hPYxgbFUba6NVJQ73mFt7BF+PXeqA/ilbZJW3GbCfAoXWLDP3qzFYqs9XeEV/FhHznkVHB88xdr+Fbv7cuCEa7PnnYbSiwr/R68EZLsGSr+u99+uu1TH6ABXG9nJna0bkwkTfx6ui/Yc2GndWS+Ew==,iv:rYdMasJS1LqMGvMYFyAdEkoTLtOHrZHGcfBOvbn63bg=,tag:YNcP/pvgKHPYNhAwVGdFHw==,type:str]
 authelia-jwt: ENC[AES256_GCM,data:cAn2uZeSGjG2FqTFgZkupcSutCZLvZXCNBsxuUQvGX4=,iv:1OTDQzQwaPTmnTEB4TfnxU6l8CdBAlHfqFThE8QZa6A=,tag:KJ6aYDczHFajhLJHemfIQw==,type:str]
 authelia-sek: ENC[AES256_GCM,data:yWhAvl1AuEcrUCFAv2vcz6A8BLEIMIz9sqbFRAriHpw=,iv:i887EZgqGtRfFs6mHHAJry0XfQzvrTaDliz8PRh7oLs=,tag:dmn2GSG8gZk9CVXMNmH1Dw==,type:str]
+snowflake-runner-token: ENC[AES256_GCM,data:CYtnZeCCd3IbNq95xCAoftYRxYf5QdZk1cw2PgRQMkBBc2kVkBpluQ==,iv:zoUvBD0QYk3rZytVjKZ8qizLxiBdzkRnTowXUULgMZY=,tag:J5vg+ipkcPKUSmbCq0Yoiw==,type:str]
+basegbot-runner-token: ENC[AES256_GCM,data:US3VkT2+S9sKPJ7zPNNBudV/884/cNfmEZVdmWHnL4WWdvUej5aIbQ==,iv:mEjU7DF4NCX7WwLP4+CxlV3aKZOkL7t6wyM4Mz7sPrg=,tag:JrMiiQ2TT3OET4iyO6pUog==,type:str]
+nixgarden-runner-token: ENC[AES256_GCM,data:3XxAKiWHxFLicQPebYwBhqL+fMft8iCkikyveIb9O++X1YuygNFRLw==,iv:DT58z4RvmVQth/4VubcMIT55CyGk1/3j5s7IQ/9Bw8s=,tag:oXDNZPTQ02Ybe9pqN5zHow==,type:str]
 searxng-secret: ENC[AES256_GCM,data:SSvspQVRp79zJq0hzaqzuJIWFtVUoaqHGH9PXUViiXb9UKJM34t82o2J5K69RcOSBL7HadqmxcT4Eh8e8ZUJnquD7rrPdWb2Ih4zS7MmG94=,iv:wrQNNU7CjzfePNe1tWEXmN30vC0jTp+PtgfI3/XH22g=,tag:QAt/QL846hLLIMLQZUM3mQ==,type:str]
 smtp2go-pwd: ENC[AES256_GCM,data:03OCDnG73T8B2Q3TJLt1kg==,iv:QFI34ZoM88AuGvOwVmxsplkNKWFgwqBn1AFdHNREses=,tag:9YABs0nAh7Cx2vybuIW9sA==,type:str]
 minio: ENC[AES256_GCM,data:ePCaN1wRnZheBsjEcAPizfGtZskS9rPxfP1kvvQvR+i3TGfwvAx2V96k59pt5GIqvxADi/lBuc4Er1EWQkMrhxMJlN4QmgU9LFOF,iv:81GUSVYe4LL/pI4Wy0CHSYwZvWNzWRBHR+KrCPEN430=,tag:9VFazb1U1XCpImZsNKpJyw==,type:str]
@@ -23,8 +26,8 @@ sops:
             YWNQcURKMSs2U0pOa3E0cTdCZ3RnalkKGayA7DBUQS+kn+6OYVBc6oTunF0qeZdt
             5b9DLHgh0HRWFm09XGSOog8K315d93Wzblw1My1/dXeEQX/ryinqUQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-01-16T06:46:14Z"
+    lastmodified: "2024-01-15T06:10:46Z"
-    mac: ENC[AES256_GCM,data:QIKiP/3+VNhKe9Pz2F9EhEQJX7DbYaDFtzufMjY3wT03IaniZSO847FNB5z8y3gygc0cqTv4p2UYeia02Y5hzwaNQR1ulclTeqPDiXGxceE5Y7POuHoZUWe8s4c97poucZSv4THcMMrE4eo8epO/vEaWD48TCB5S1yG1qVBOT7M=,iv:b+EmOWw23/XVcVD6i+cExSlQ02BNmdfk23nmOYose9g=,tag:PcZLi48S6UPiON9vrSQDGA==,type:str]
+    mac: ENC[AES256_GCM,data:D7a1XpNCo4ftg0SJxgyaan05X454NosxJ1/GFOBtLDMVOvLXo5vFYMKqcPFGmyIQnX6jkNIXGMmsqqdooP0jt+QjZbx8aM/nPKKl/qu9D1oNDwXd5OG8n7XJklhVAkMTkVJfHGMr5F/Z0XVNzjMzMsyycDCGz0N7KvggRqhOvzo=,iv:bjCQ3Le1YQaIWiU7guwGJxHVuDzWFYsk8Cj5KX1S9u0=,tag:OojV0qfxzumqV8RHOWFvHg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1