diff --git a/flake.nix b/flake.nix index 904b08d..ee607cc 100644 --- a/flake.nix +++ b/flake.nix @@ -293,26 +293,6 @@ ./hosts/git ]; }; - nixosConfigurations."forgejo-runner" = nixpkgs.lib.nixosSystem { - #system = "x86_64-linux"; - #pkgs = import nixpkgs { inherit system; }; - inherit system; - modules = [ - agenix.nixosModules.default - { environment.systemPackages = [ (agenix.packages.${system}.default) ]; } - { - age.secrets = { - forgejo-runner-token-snowden = { - file = ./secrets/forgejo-runner-token-snowden.age; - owner = "root"; - group = "root"; - mode = "0444"; - }; - }; - } - ./hosts/forgejo-runner - ]; - }; }; #); } diff --git a/hosts/forgejo-runner/default.nix b/hosts/forgejo-runner/default.nix deleted file mode 100644 index 774d39a..0000000 --- a/hosts/forgejo-runner/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ ... }: - -{ - imports = [ - ../common.nix - ../../services/openssh.nix - ../../services/prometheus-node.nix - ./forgejo-runner.nix - ]; - - networking = { - hostName = "forgejo-runner"; - firewall = { - allowedTCPPorts = [ - 22 # SSH - ]; - }; - }; - - users.users.root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMn0SP19A5C8PqdH+99ki3TILozj/U4tBSQxcRRepN21 samuel@pluto" - ]; - - environment.etc."ssh/banner".text = '' - _ __ __ __ ___ ___ __ _ __ - /\`'__\/\ \/\ \ /' _ `\ /' _ `\ /'__`\/\`'__\ - \ \ \/ \ \ \_\ \/\ \/\ \/\ \/\ \/\ __/\ \ \/ - \ \_\ \ \____/\ \_\ \_\ \_\ \_\ \____\\ \_\ - \/_/ \/___/ \/_/\/_/\/_/\/_/\/____/ \/_/ - ''; - services.openssh.settings.Banner = "/etc/ssh/banner"; - - system.stateVersion = "26.05"; -} diff --git a/hosts/forgejo-runner/forgejo-runner.nix b/hosts/forgejo-runner/forgejo-runner.nix deleted file mode 100644 index bc17c77..0000000 --- a/hosts/forgejo-runner/forgejo-runner.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ config, pkgs, ... }: - -{ - services.gitea-actions-runner = { - package = pkgs.forgejo-runner; - instances.snowden = { - enable = true; - name = "snowden"; - url = "https://git.berlin.ccc.de"; - labels = [ - "debian-stable:docker://docker.io/debian:stable-slim" - "alpine-latest:docker://docker.io/alpine:latest" - "buildkit:docker://docker.io/moby/buildkit:rootless" - ]; - tokenFile = config.age.secrets.forgejo-runner-token-env.path; - settings = { - runner.labels = { - debian-stable = { - backend = "docker"; - backend-options = { - image = "docker.io/debian:stable-slim"; - platform = "linux/amd64"; - }; - }; - alpine-latest = { - backend = "docker"; - backend-options = { - image = "docker.io/alpine:latest"; - platform = "linux/amd64"; - }; - }; - buildkit = { - backend = "docker"; - backend-options = { - image = "docker.io/moby/buildkit:rootless"; - platform = "linux/amd64"; - }; - }; - }; - server.connections.forgejo = { - url = "https://git.berlin.ccc.de/"; - uuid = "7fd3683e-1bc1-429f-8467-e6d27044eb91"; - token_url = "file://${config.age.secrets.forgejo-runner-token.path}"; - }; - container = { - enable_ipv6 = true; - docker_host = "unix:///run/podman/podman.sock"; - }; - }; - }; - }; -} diff --git a/secrets/forgejo-runner-token-snowden.age b/secrets/forgejo-runner-token-snowden.age index cbe40ad..33ec88e 100644 Binary files a/secrets/forgejo-runner-token-snowden.age and b/secrets/forgejo-runner-token-snowden.age differ diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 42f11a6..14e5f9c 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -24,7 +24,6 @@ let _monitoring = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINmRWdAUur0lb08NiB6ZWLrGmCeELRV30ElxRLfVJGPB root@monitoring"; _dav = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICArHbX8OlNOv8HCWyyFvyi60d6MRFYe+apK0iGJ7yIM root@dav"; _git = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII93S1RUXVbH6mQksk9c5fXP8avSKXEUHBH0a7/ZbZY5 root@git"; - _runner = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFC7hGJC7cZ2NlrPEP9dhX1+vBNpoTFVNTKcyJX+EVP root@forgejo-runner"; in { "matrix_admin_password.age".publicKeys = xengi; @@ -67,7 +66,7 @@ in "radicale_htpasswd.age".publicKeys = xengi ++ [ _dav ]; "forgejo-internal-token.age".publicKeys = xengi ++ kaythxbye ++ [ _git ]; "forgejo-runner-token-snowden-env.age".publicKeys = xengi ++ kaythxbye ++ [ _git ]; - "forgejo-runner-token-snowden.age".publicKeys = xengi ++ kaythxbye ++ [ _git _runner ]; + "forgejo-runner-token-snowden.age".publicKeys = xengi ++ kaythxbye ++ [ _git ]; "forgejo-secret-key.age".publicKeys = xengi ++ kaythxbye ++ [ _git ]; "forgejo-oauth2-jwt-secret.age".publicKeys = xengi ++ kaythxbye ++ [ _git ]; }