diff --git a/infra/README.md b/infra/README.md index ac1cfe33..25250245 100644 --- a/infra/README.md +++ b/infra/README.md @@ -128,4 +128,3 @@ They host our stable infrastructure. vm02187 Procolix Wiki `web` fedi200 Fediversity Testing machine for Hans `hans` fedi201 Fediversity FediPanel `kiara` - fedi300 Fediversity Forgejo actions runner `git` diff --git a/infra/fedi300/default.nix b/infra/fedi300/default.nix deleted file mode 100644 index deb76c3a..00000000 --- a/infra/fedi300/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - fediversityVm = { - domain = "fediversity.eu"; - - ipv4 = { - address = "95.215.187.30"; - gateway = "95.215.187.1"; - }; - ipv6 = { - address = "2a00:51c0:12:1305::30"; - gateway = "2a00:51c0:13:1305::1"; - }; - }; - - nixos.module = - { lib, ... }: - { - imports = [ - ./forgejo-actions-runner.nix - ]; - - ## NOTE: This VM was created manually, which requires us to override the - ## default disko-based `fileSystems` definition. - fileSystems = lib.mkForce { - "/" = { - device = "/dev/disk/by-uuid/cbcfaf6b-39bd-4328-9f53-dea8a9d32ecc"; - fsType = "ext4"; - }; - - "/boot" = { - device = "/dev/disk/by-uuid/1A4E-07F4"; - fsType = "vfat"; - options = [ - "fmask=0022" - "dmask=0022" - ]; - }; - }; - }; -} diff --git a/infra/fedi300/forgejo-actions-runner.nix b/infra/fedi300/forgejo-actions-runner.nix deleted file mode 100644 index 39024b60..00000000 --- a/infra/fedi300/forgejo-actions-runner.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ pkgs, config, ... }: - -{ - services.gitea-actions-runner = { - package = pkgs.forgejo-actions-runner; - - instances.default = { - enable = true; - - name = config.networking.fqdn; - url = "https://git.fediversity.eu"; - tokenFile = config.age.secrets.forgejo-runner-token.path; - - settings = { - log.level = "info"; - runner = { - file = ".runner"; - capacity = 24; - timeout = "3h"; - insecure = false; - fetch_timeout = "5s"; - fetch_interval = "2s"; - }; - }; - - ## This runner supports Docker (with a default Ubuntu image) and native - ## modes. In native mode, it contains a few default packages. - labels = [ - "docker:docker://node:16-bullseye" - "native:host" - ]; - - hostPackages = with pkgs; [ - bash - git - nix - nodejs - ]; - }; - }; - - ## For the Docker mode of the runner. - virtualisation.docker.enable = true; -} diff --git a/infra/flake-part.nix b/infra/flake-part.nix index 871176e7..cf26e87c 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -76,7 +76,6 @@ let machines = { git = [ "vm02116" - "fedi300" ]; web = [ "vm02187" ]; other = [ diff --git a/keys/systems/fedi300.pub b/keys/systems/fedi300.pub deleted file mode 100644 index 1f2f6a8c..00000000 --- a/keys/systems/fedi300.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGFH/Kvye5It8FojdjpsuyZQiU0kxj2wq7Zq/+61vxNn diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 10520da9..ae5f19ed 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -26,7 +26,7 @@ concatMapAttrs { forgejo-database-password = [ vm02116 ]; forgejo-email-password = [ vm02116 ]; - forgejo-runner-token = [ fedi300 ]; + forgejo-runner-token = [ ]; wiki-basicauth-htpasswd = [ vm02187 ]; wiki-password = [ vm02187 ]; wiki-smtp-password = [ vm02187 ];