From c74fc4f927adb7d41c9280d6310d381a2d2f4ecc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=E2=80=9CNiols=E2=80=9D=20Jeannerod?= <nicolas.jeannerod@moduscreate.com> Date: Mon, 24 Feb 2025 14:49:53 +0100 Subject: [PATCH] Add VM for the front-end (#183) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For now, I created yet another deployment. Basically, this seems to tell me that we only ever use: - one deployment per machine (when we change its configuration) - one big deployment for all of them (eg. for nixpkgs updates or new contributor) but that the current split into themes doesn't really work. I can discontinue it in another PR. `fedi201` is accessible under `fedi201.abundos.eu`. Its configuration lives in `infra/fedi201/default.nix`. This Nix file is a NixOps4 resource module, not a NixOS configuration module; you probably want to add a `nixos.module` field to it where you put your NixOS configuration. Reviewed-on: https://git.fediversity.eu/Fediversity/Fediversity/pulls/183 Reviewed-by: kiara Grouwstra <kiara@procolix.eu> Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com> Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com> --- infra/README.md | 1 + infra/fedi201/default.nix | 13 +++++++++++++ infra/flake-part.nix | 3 +++ keys/systems/fedi201.pub | 1 + 4 files changed, 18 insertions(+) create mode 100644 infra/fedi201/default.nix create mode 100644 keys/systems/fedi201.pub diff --git a/infra/README.md b/infra/README.md index 0643ed54..ac1cfe33 100644 --- a/infra/README.md +++ b/infra/README.md @@ -127,4 +127,5 @@ They host our stable infrastructure. vm02186 Procolix *unused* `other` 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/fedi201/default.nix b/infra/fedi201/default.nix new file mode 100644 index 00000000..c0d1bd90 --- /dev/null +++ b/infra/fedi201/default.nix @@ -0,0 +1,13 @@ +{ + fediversityVm = { + domain = "abundos.eu"; + ipv4 = { + address = "95.215.187.201"; + gateway = "95.215.187.1"; + }; + ipv6 = { + address = "2a00:51c0:13:1305::201"; + gateway = "2a00:51c0:13:1305::1"; + }; + }; +} diff --git a/infra/flake-part.nix b/infra/flake-part.nix index 496ab033..871176e7 100644 --- a/infra/flake-part.nix +++ b/infra/flake-part.nix @@ -86,6 +86,9 @@ let hans = [ "fedi200" ]; + kiara = [ + "fedi201" + ]; }; in diff --git a/keys/systems/fedi201.pub b/keys/systems/fedi201.pub new file mode 100644 index 00000000..1e769352 --- /dev/null +++ b/keys/systems/fedi201.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILhSlUo7L/TjoAILfLv/BDxlBT+rGudh9VoK50Uiu2lZ root@fedi201