From 22035d893d0eedbfdb9c90a528e21bdd5aaf99b0 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 10 Jul 2024 16:28:39 -0400 Subject: [PATCH] [systems.marvin] Add gitgay runner --- .../secrets/forgejo-gitgay-runner-token.age | 19 +++++++++++++++++++ .../x86_64-linux/marvin/secrets/secrets.nix | 1 + systems/x86_64-linux/marvin/services/git.nix | 10 ++++++++++ 3 files changed, 30 insertions(+) create mode 100644 systems/x86_64-linux/marvin/secrets/forgejo-gitgay-runner-token.age diff --git a/systems/x86_64-linux/marvin/secrets/forgejo-gitgay-runner-token.age b/systems/x86_64-linux/marvin/secrets/forgejo-gitgay-runner-token.age new file mode 100644 index 00000000..8120e9dd --- /dev/null +++ b/systems/x86_64-linux/marvin/secrets/forgejo-gitgay-runner-token.age @@ -0,0 +1,19 @@ +age-encryption.org/v1 +-> ssh-ed25519 iqBxIA NtvHYtlP2R1/ySw+0gQk8q1QJcujtjMK9h8BXTLnpFU +5+iRMI+OvjQMSR8TkEO5QXFp0u6De3EVtmt+OttYLAw +-> ssh-rsa fFaiTA +MiYovathZe/ZO/NvHsRTFaAlj8GsHgBcbVkkV9MDoYhacdomegj+J2nQks/j+TbP +zU9BSBMSyzWrYuCi15kISyk962mSc7Gte4nwJvUUiZdWq/Vm2dSLyV57EHBgSXl/ +C9DHnS78OgTDn8YeeRviLkJ87LEEPF9yGG2z/YN4i53Cuy8UDQagdpFG4dWjGnQn +hImg4bI99h1coaCf8PfsuLsdumbR6y12rdW0A5cEyhfDoodV9hILGuP9KCtUXNxO +BrxDlpVC5CjUZ1xcz1qgQA8QvKbl7qVitxmr5+1pHwtscaiTufOs4MI+ZxCKwOhJ +VPiy01TesPHR9oua/7Ap4dBOTpKRPb8GyaCVyRvkb4cVIlQNgIYuL3pkB3KOM3Ct +VhvXVgXxB6Gb78gJkBy/uwmnSybfnzjv1z+yA9f8VFBzt+i2kDq8/37Tng9DSVGj +4yS67uYQkT5+OVrcjNwBd3NAguVNNg1PEsIE8SvnLXRmI79gjiMdlmZFTsAl2EZN +2CMUaR9r0O88xhEf7FKQ9CUjZjfZvyhHPaJXADfducaVhB56RCIf3jwtsdFnTzzZ +UMIYJ57Pe8m0ESjzp/8+6wH4MPaMULSJhxnpUJW5y5qqnpvRo1dQiPRkW3Xxjh3H +2ulClJg8m7Tqj/nASJFZkqI7PUxjnAteEUcY2WBRtMA +-> ssh-ed25519 wpmdHA OYK95VOo8jFn31+P4keeW0eJco7PKVE82NQL0U+0f1I +D7O1m8QTLBARYjzUJBBX18Ko62iu7ETDD/CJHptTBf8 +--- ku5u3TkIGQvE212JtizdwVoz4B0Jx3wvvPrGFfvihGg +�gL�y+72.O\A�,U&z����y +�Y��OB=�#� �=/���}�@W�xx���� \'��~�x.����5?�X� \ No newline at end of file diff --git a/systems/x86_64-linux/marvin/secrets/secrets.nix b/systems/x86_64-linux/marvin/secrets/secrets.nix index dff530b0..aca4d29b 100644 --- a/systems/x86_64-linux/marvin/secrets/secrets.nix +++ b/systems/x86_64-linux/marvin/secrets/secrets.nix @@ -20,6 +20,7 @@ in "forgejo-db-pw.age".publicKeys = default; "forgejo-mail-pw.age".publicKeys = default; "forgejo-default-runner-token.age".publicKeys = default; + "forgejo-gitgay-runner-token.age".publicKeys = default; "forgejo-internal-token.age".publicKeys = default; "forgejo-lfs-jwt-secret.age".publicKeys = default; "forgejo-oauth2-jwt-secret.age".publicKeys = default; diff --git a/systems/x86_64-linux/marvin/services/git.nix b/systems/x86_64-linux/marvin/services/git.nix index 953f7026..b2aeaae5 100644 --- a/systems/x86_64-linux/marvin/services/git.nix +++ b/systems/x86_64-linux/marvin/services/git.nix @@ -15,6 +15,13 @@ in enable = true; tokenFile = age.forgejo-default-runner-token.path; }; + services.gitea-actions-runner.instances.gitgay = { + enable = true; + labels = [ "docker:docker://git.gay/gitgay/docker_images:22.04" ]; + tokenFile = age.forgejo-gitgay-runner-token.path; + url = "https://git.gay"; + name = "marvin-gitgay"; + }; services.forgejo = { enable = true; lfs.enable = true; @@ -122,6 +129,9 @@ in forgejo-default-runner-token = forgejoSecret // { file = ../secrets/forgejo-default-runner-token.age; }; + forgejo-gitgay-runner-token = forgejoSecret // { + file = ../secrets/forgejo-gitgay-runner-token.age; + }; forgejo-internal-token = forgejoSecret // { file = ../secrets/forgejo-internal-token.age; }; -- 2.54.0