kiara/Fediversity
1
0
Fork 0
forked from fediversity/fediversity
Code Pull requests Activity
863 commits 138 branches 0 tags 57 MiB
Commit graph

63 commits

Author SHA1 Message Date
Nicolas “Niols” Jeannerod
588bb77a94 Infra: expose and use checks for vmOptions and nixosConfigurations (#488) 
Following Fediversity/Fediversity#478 (comment), here is a PR that plugs the infra's `vmOptions` and `nixosConfigurations` outputs into flake checks, instead of calling random Nix commands from the CI. There is still a bit of magic in the CI, but that's because we don't have yet a Nix-aware CI that exposes one job per flake check.

Reviewed-on: Fediversity/Fediversity#488
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>
 2025-07-31 15:41:02 +02:00
Nicolas “Niols” Jeannerod
df3a070fa4 Infra: get rid of makeResourceModule (#485) 
Reviewed-on: Fediversity/Fediversity#485
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
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>
 2025-07-31 00:49:00 +02:00
Nicolas “Niols” Jeannerod
1b66028f32 Fix infra and add more tests (#478) 
This PR contains a bunch of small fixes having to do with infra code. The goal is not to fix everything as that would require a full rewrite. Instead, we fix just what is necessary to get some testing going on. Once that is available, we will be able to work on a full refactor with more guarantees. Something of note is that most of the difficulty was to find code that would make both `nixops4 apply` _and_ `nix build .#nixosConfigurations.<machine>` happy. The takeaway is that the tests that we are adding now will not catch a whole class of tests having to do with how NixOps4 wires up the resources. Still, this is probably less significant as we are supposed to use NixOps4 every now and then.

The commits should be read separately.

Reviewed-on: Fediversity/Fediversity#478
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>
 2025-07-30 12:31:03 +02:00
Kiara Grouwstra
765183cd0d fix typo in users (#475) 
Reviewed-on: Fediversity/Fediversity#475
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-17 19:02:14 +02:00
Kiara Grouwstra
6cf1d87f0b get parity in authorized keys between procolix and root for nixops4 ssh to non-VMs (#474) 
Reviewed-on: Fediversity/Fediversity#474
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-17 18:59:31 +02:00
Valentin Gagarin
b791bd515d pass sources via specialArgs (#464) 
this gets rid of ugly in-place imports and upward paths

Reviewed-on: Fediversity/Fediversity#464
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-committed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2025-07-16 10:53:36 +02:00
Kiara Grouwstra
b9b13df04e allow SSH access from continuous deployment (#460) 
Reviewed-on: Fediversity/Fediversity#460
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-15 11:56:22 +02:00
Kiara Grouwstra
aef414ffe8 resolve regressions from recent qemu files (#432) 
- move import to match module classes
- manually import sources to resolve infinite recursion

closes #431.

Reviewed-on: Fediversity/Fediversity#432
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-11 16:09:27 +02:00
Kiara Grouwstra
a882de0b8e address linter gripes in nix files (#430) 
Reviewed-on: Fediversity/Fediversity#430
Reviewed-by: Nicolas Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-03 15:56:16 +02:00
Kiara Grouwstra
871672d447 Add forgejo-ci machine to our infrastructure (#389) 
picked up from https://git.fediversity.eu/Fediversity/Fediversity/compare/main...niols:forgejo-ci.

closes #356.

Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Reviewed-on: Fediversity/Fediversity#389
Reviewed-by: Nicolas Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-02 17:43:09 +02:00
Nicolas “Niols” Jeannerod
1c92009879
Do not force QEMU options onto machines 2025-07-01 23:55:33 +02:00
Kiara Grouwstra
a791ad41ec Inject sources, secrets and keys via module system - avoid import ../ (#421) 
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Reviewed-on: Fediversity/Fediversity#421
Reviewed-by: Nicolas Jeannerod <nicolas.jeannerod@moduscreate.com>
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-01 21:08:15 +02:00
Nicolas “Niols” Jeannerod
c1dc0fef01 Split nameservers between IPv4 and IPv6 (#420) 
Reviewed-on: Fediversity/Fediversity#420
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
Co-committed-by: Nicolas “Niols” Jeannerod <nicolas.jeannerod@moduscreate.com>
 2025-07-01 13:09:06 +02:00
Kiara Grouwstra
0c23115cff allow configuring network interface (#413) 
Reviewed-on: Fediversity/Fediversity#413
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-06-30 19:23:51 +02:00
Kiara Grouwstra
ae444d5352 simplify imports (#415) 
Reviewed-on: Fediversity/Fediversity#415
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-06-27 14:01:41 +02:00
Kiara Grouwstra
1f1cf0d516 unset class, fixing #408 (#410) 
Reviewed-on: Fediversity/Fediversity#410
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-06-27 11:53:17 +02:00
Kiara Grouwstra
9a25a04bfa specify _class module attributes to explicitly declare module types (#398) 
closes #93.

note that this includes classes:

- `nixos`
- `nixosTest`
- `nixops4Resource`
- `nixops4Deployment`

.. and my (made-up, as per the [docs](https://ryantm.github.io/nixpkgs/module-system/module-system/#module-system-lib-evalModules-param-class)):

- `nix-unit`
- `package`

.. while i did not manage to cover:

- service tests, given `pkgs.nixosTest` seemed to not actually like `_class = "nixosTest"` (?!)

... nor #93's mentioned destructured arguments for that matter, as per Fediversity/Fediversity#93 (comment) - let me know if that is still desired as well.

Reviewed-on: Fediversity/Fediversity#398
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-06-23 17:24:54 +02:00
Valentin Gagarin
d67f533948 fix running nixops4 apply test (#391) 
Closes #390

Reviewed-on: Fediversity/Fediversity#391
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-committed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2025-06-19 08:26:20 +02:00
Kiara Grouwstra
f4ebf55a15
unify versioning (minus around nixops, for now) 2025-05-01 13:24:45 +02:00
Kiara Grouwstra
c69f1f52e0 allow accessing test vms from fedi201, closes #286 (#297) 
Reviewed-on: Fediversity/Fediversity#297
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-04-09 16:58:50 +02:00
lois
7afae84b6c Add pub key Lois 2025-03-12 12:01:50 +01:00
Nicolas “Niols” Jeannerod
0b18938eaa
Support specifying disk size 2025-02-27 16:45:11 +01:00
Nicolas “Niols” Jeannerod
b42d654ab6
Track machines' descriptions 2025-02-27 16:45:11 +01:00
Nicolas “Niols” Jeannerod
11fd13a982
Allow injecting a private key in the provisioned VM 2025-02-25 11:57:20 +01:00
Nicolas “Niols” Jeannerod
bd270999f3
Integrate hostPublicKey with the options 2025-02-25 11:57:20 +01:00
Nicolas “Niols” Jeannerod
10874c995e
Split sections in options 2025-02-25 11:36:55 +01:00
Nicolas “Niols” Jeannerod
af4a0a0784
Add options for sockets, cores and memory 2025-02-25 11:36:55 +01:00
Nicolas “Niols” Jeannerod
0813eca20c
Add options for Proxmox and Proxmox VM id 2025-02-25 11:36:54 +01:00
Nicolas “Niols” Jeannerod
1677c9f8d7 Remove environment.systemPackages from VMs (#176) 
Closes #25

Co-authored-by: kiara Grouwstra <kiara@procolix.eu>
Reviewed-on: Fediversity/Fediversity#176
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>
 2025-02-24 14:54:28 +01:00
Kiara Grouwstra
e9a4185401
users: add kiara 2025-02-24 13:31:31 +01:00
Nicolas “Niols” Jeannerod
cd1679afec
procolixVm -> fediversityVm 2025-02-21 20:24:41 +01:00
Nicolas “Niols” Jeannerod
3dc7f49a9c
Add the disko configuration to all VMs 2025-02-21 20:24:41 +01:00
Nicolas “Niols” Jeannerod
f0224b06c7
Inject disko in VM configurations 2025-02-21 20:24:41 +01:00
Nicolas “Niols” Jeannerod
0e6c96a2be
Document the procolixVm options 2025-01-31 17:23:12 +01:00
Nicolas “Niols” Jeannerod
4d00635e69
Move old procolix.vm options to new procolixVm ones 2025-01-31 17:15:12 +01:00
Nicolas “Niols” Jeannerod
eaad4daa39
Cleaner resource definition 2025-01-31 16:57:21 +01:00
Nicolas “Niols” Jeannerod
e0b4dd4d5b
Shorter name 2025-01-31 16:48:08 +01:00
Nicolas “Niols” Jeannerod
54194cd494
Share options between resource and config 2025-01-31 16:47:33 +01:00
Nicolas “Niols” Jeannerod
ba97ed26d0
Get rid of useless self and providers arguments 2025-01-31 16:34:21 +01:00
Nicolas “Niols” Jeannerod
564938e52d
Clean up handling of secrets in infra 2025-01-31 16:29:31 +01:00
Nicolas “Niols” Jeannerod
9c85431a22
Move everything into common with better names 2025-01-31 15:22:28 +01:00
Nicolas “Niols” Jeannerod
873a1c9177
Automatically git root access to all contributors 2025-01-31 10:59:36 +01:00
Nicolas “Niols” Jeannerod
732760bc0c
Move Nix options to common 2024-12-16 12:57:02 +01:00
Nicolas “Niols” Jeannerod
b04b3c457f
Fix typo 2024-11-22 17:37:15 +01:00
Nicolas “Niols” Jeannerod
fca563a987
nix.settings.trusted-users 2024-11-21 12:06:35 +01:00
Nicolas “Niols” Jeannerod
9f471327df
environment.systemPackages 2024-11-21 12:04:59 +01:00
Nicolas “Niols” Jeannerod
0749bda96c
networking.useDHCP 2024-11-21 12:04:02 +01:00
Nicolas “Niols” Jeannerod
9888ae0d07
nixpkgs.hostPlatform 2024-11-21 12:04:02 +01:00
Nicolas “Niols” Jeannerod
dbba09de45
system.stateVersion 2024-11-21 12:04:00 +01:00
Nicolas “Niols” Jeannerod
17611b7e53
Timezone and locale 2024-11-21 12:03:12 +01:00