kiara/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity
859 commits 107 branches 0 tags 49 MiB
Commit graph

859 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kiara Grouwstra
c94d575392
use mapAttrs right 
`mapAttrs'` takes two args rather than a set, whereas if only the val
changes `mapAttrs (_: v: ...)` should do
 2025-07-22 19:12:47 +02:00
Kiara Grouwstra
307ff1d6ac
fix typos, lint, format 2025-07-19 18:38:46 +02:00
Valentin Gagarin
4b031652f7
WIP: illustrate an entire NixOS configuration as a resource 2025-07-19 18:38:43 +02:00
Valentin Gagarin
71446a891f
WIP: (broken) implement test 2025-07-19 18:38:36 +02:00
Valentin Gagarin
37df0f370d
WIP: implement mappings 2025-07-19 18:34:18 +02:00
Valentin Gagarin
5b1993c800
WIP: start writing an evaluation test 
turns out we also need a collection of configurations, obviously
next: figure out where to wire everything up to obtain a deployment
 2025-07-19 18:31:26 +02:00
Valentin Gagarin
17647b194b
WIP: add missing types 2025-07-19 18:31:07 +02:00
Valentin Gagarin
dd0aff13d7
WIP: implement data model as in diagram 
this doesn't update the tests yet because we don't have all the data
types in place anyway yet, and I still need to come up with testable examples.
 2025-07-19 18:30:26 +02:00
Kiara Grouwstra
15967158bc
better reflect naming from diagram configuration data flow 2025-07-19 18:29:41 +02:00
Kiara Grouwstra
e3e2a3359c
data model: migration 2025-07-19 18:29:09 +02:00
Kiara Grouwstra
9230ea540c
data model: deployment 2025-07-19 18:29:02 +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
Kiara Grouwstra
8253288f8a remove pixelfed from CI until fixed (#472) 
this test is still borked as per #33.
the intent would be to get this test on a feature branch pertaining to that issue - the point being we should be able to rely on CI's boolean result for detecting (newly induced) regressions.

Reviewed-on: Fediversity/Fediversity#472
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-17 15:25:17 +02:00
Kiara Grouwstra
67f50f08de enable continuous deployment (#471) 
closes #177

Reviewed-on: Fediversity/Fediversity#471
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-17 10:01:51 +02:00
Kiara Grouwstra
5402178e7b reinstate import statement for panel module, fixes error deploying fedi201 (#468) 
resolves error on CI run https://git.fediversity.eu/Fediversity/Fediversity/actions/runs/1026:

```
123456       error: attempt to call something which is not a function but a path: /nix/store/93yyf22vw60l1j3l6h02c99p93lp55q5-source/panel
       at /nix/store/93yyf22vw60l1j3l6h02c99p93lp55q5-source/machines/dev/fedi201/fedipanel.nix:13:6:
           12|   imports = [
           13|     (../../../panel { }).module
             |      ^
           14|     "${sources.home-manager}/nixos"```
```

Reviewed-on: Fediversity/Fediversity#468
 2025-07-16 20:51:23 +02:00
Kiara Grouwstra
e627815399 pass SHELL env var in CD (#466) 
see #177

Reviewed-on: Fediversity/Fediversity#466
 2025-07-16 18:18:16 +02:00
Kiara Grouwstra
354dba260a verbose CD (#465) 
debugging effort part of #177

Reviewed-on: Fediversity/Fediversity#465
 2025-07-16 14:14:06 +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
f2017aaeb4 CD: lump SSH commands into a single shell invocation (#462) 
Reviewed-on: Fediversity/Fediversity#462
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-15 13:00:47 +02:00
Kiara Grouwstra
980a994f83 run ssh commands thru the shell (which has openssh) (#461) 
Reviewed-on: Fediversity/Fediversity#461
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-15 12:26:16 +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
159e4107b8 fix Pixelfed test eval failure (#458) 
Reviewed-on: Fediversity/Fediversity#458
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-15 10:38:10 +02:00
fricklerhandwerk
86305a6a2e fix link; readability 2025-07-15 09:04:56 +02:00
Valentin Gagarin
e62f14d9be expose panel tests in flake 2025-07-15 08:54:48 +02:00
Kiara Grouwstra
82f83eea0d fix mastodon test (#457) 
closes #34.

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Reviewed-on: Fediversity/Fediversity#457
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 08:54:20 +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
6d74112518 ditch sources arg in fedi201, fixing infinite recursion error (#454) 
c.f. #432.

closes #453.

Reviewed-on: Fediversity/Fediversity#454
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-11 16:06:15 +02:00
Kiara Grouwstra
2b2fb059fd fix cd command (#455) 
Reviewed-on: Fediversity/Fediversity#455
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-11 11:07:03 +02:00
Kiara Grouwstra
66ceb66382 add deployment pipeline (#452) 
part of #177

Reviewed-on: Fediversity/Fediversity#452
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-10 16:45:46 +02:00
fricklerhandwerk
ad9c61a3db docs: fix typos 2025-07-10 00:37:27 +02:00
Nicolas “Niols” Jeannerod
b4e1c5b5b3 Restrict fileset necessary for deployment tests (#450) 
Now that we won't depend on the flake.nix anymore, we won't depend on all the flake-part.nix files (necessary to evaluate flake.nix) and all the files they depend on etc., so the Nix dependencies of the tests will be drastically reduced, and I will be able to leverage that by introducing a more subtle src. This will make the test not need to re-run if only things outside that reduced src changed (and the previous run is in the Nix store).

Reviewed-on: Fediversity/Fediversity#450
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
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-09 22:57:52 +02:00
Nicolas “Niols” Jeannerod
de38611572 Unflakify deployment tests (#449) 
This PR builds on top of #447 and #448. Since these might be rejected, there will be some changes needed for this PR as well. Let's see how the discussions go in #447.

In the meantime, @fricklerhandwerk, would you mind (in)validating the core idea of this PR? You only need to look at 7cf43c4041, really.

Reviewed-on: Fediversity/Fediversity#449
Reviewed-by: kiara Grouwstra <kiara@procolix.eu>
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-09 15:07:02 +02:00
Nicolas “Niols” Jeannerod
1d40dcfc0e Grab git-hooks from npins (#448) 
This PR builds on top of #447 and will be subject to the same discussion. Let's discuss there whether it makes sense to get rid of the `flake-parts` and `git-hooks` flake inputs.

Reviewed-on: Fediversity/Fediversity#448
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-09 13:21:48 +02:00
Nicolas “Niols” Jeannerod
c3bf158130 Note on extracting mkFlake to an external library (#451) 
follow-up on Fediversity/Fediversity#447 (comment)

Reviewed-on: Fediversity/Fediversity#451
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-09 12:34:43 +02:00
Nicolas “Niols” Jeannerod
48c6a1f22b Extract mkFlake to own file - get flake-parts from npins (#447) 
The goal is to contain the “`mkFlake` hack” to a file that we can heavily document but otherwise ignore. This also will allow me to reuse it in the “flake under test” of the deployment tests.

Reviewed-on: Fediversity/Fediversity#447
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-09 10:12:47 +02:00
Kiara Grouwstra
8a7984933d reinstate acme settings needed by applications (#434) 
closes #417

Reviewed-on: Fediversity/Fediversity#434
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-08 10:02:13 +02:00
Kiara Grouwstra
5520fa721b gitea PR unpruned (#445) 
see #65

Reviewed-on: Fediversity/Fediversity#445
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-07 13:38:09 +02:00
Kiara Grouwstra
eabfc228c5 updater: try the first upstream commit without git remote prune (#444) 
Reviewed-on: Fediversity/Fediversity#444
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-07 13:23:08 +02:00
Kiara Grouwstra
3f923532a2 updater: fully qualify github domain in uses (#443) 
part of #65.
succeeds #442.

Reviewed-on: Fediversity/Fediversity#443
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-07 12:50:55 +02:00
Kiara Grouwstra
37d4fc5a42 un-qualify github.com domain in updater uses, which resolved to data.forgejo.org/github.com (#442) 
attempt to address https://git.fediversity.eu/Fediversity/Fediversity/actions/runs/920.
part of #65.

Reviewed-on: Fediversity/Fediversity#442
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-07 12:47:06 +02:00
Kiara Grouwstra
c7b05bb473 deduplicate import-flake, fixing test regression from git merge (#441) 
Reviewed-on: Fediversity/Fediversity#441
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-07 10:58:10 +02:00
Kiara Grouwstra
5345860006 data model: add run-time configuration (#437) 
based on @fricklerhandwerk's work at https://git.fediversity.eu/fricklerhandwerk/Fediversity/compare/main...data-model-as-diagram part of #103.
supersedes #402.

on the application model, feedback on a [sample implementation](#2) welcome as well.

Reviewed-on: Fediversity/Fediversity#437
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-06 21:42:25 +02:00
Kiara Grouwstra
fbb0806072 in update workflow use PR action actually meant for gitea (#438) 
see #65

Reviewed-on: Fediversity/Fediversity#438
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-06 21:39:26 +02:00
Kiara Grouwstra
b0848727fd clarify the use of isNormalUser (#436) 
Reviewed-on: Fediversity/Fediversity#436
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
 2025-07-06 09:09:43 +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
05572ff69e remove string interpolation from imports (#429) 
Reviewed-on: Fediversity/Fediversity#429
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:55:39 +02:00
Nicolas “Niols” Jeannerod
13c92280ab Clean up lib in forgejo-ci and extend on the .ssh/config comment (#428) 
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>
 2025-07-02 17:49:44 +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
Kiara Grouwstra
6da42936e7 add missing home-manager import to fedipanel VM (#425) 
Reviewed-on: Fediversity/Fediversity#425
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:32:38 +02:00