kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

Clean up lib in forgejo-ci and extend on the .ssh/config comment (#428)

Browse source 
Reviewed-on: Fediversity/Fediversity#428
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>
This commit is contained in:
Nicolas Jeannerod 2025-07-02 17:49:44 +02:00 • committed by kiara Grouwstra
parent 871672d447
commit 13c92280ab
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
machines/dev/forgejo-ci/default.nix
View file

@ -1,12 +1,23 @@
{ { lib, ... }:
lib,
... let
}: inherit (lib) mkDefault mkForce;
in
{ {
_class = "nixops4Resource"; _class = "nixops4Resource";
# XXX this needs an SSH config entry `forgejo-ci` to locate and access the machine. also needs `HostKeyAlias`. # NOTE: This needs an SSH config entry `forgejo-ci` to locate and access the
ssh.host = lib.mkForce "forgejo-ci"; # machine. This is because different people access the machine in different
# way (eg. via a proxy vs. via Procolix's VPN). This might look like:
#
# Host forgejo-ci
# HostName 45.142.234.216
# HostKeyAlias forgejo-ci
#
# The `HostKeyAlias` statement is crucial. Without it, deployment will fail
# with the SSH error “Host key verification failed”.
ssh.host = mkForce "forgejo-ci";
fediversityVm = { fediversityVm = {
domain = "procolix.com"; domain = "procolix.com";
@ -21,14 +32,7 @@
}; };
nixos.module = nixos.module =
{ { config, ... }:
config,
lib,
...
}:
let
inherit (lib) mkDefault mkForce;
in
{ {
_class = "nixos"; _class = "nixos";