still go thru shell to actually load it

pull attic-client into shell as CI is missing <nixpkgs> for nix-shell
collapse caching ci test, given it seems to not carry over variables between steps
2025-07-05 21:29:41 +02:00 · 2025-07-05 21:29:41 +02:00 · 2025-07-05 21:29:41 +02:00 · 2025-07-05 21:29:41 +02:00 · 2025-07-05 21:29:41 +02:00 · 2025-07-05 21:29:41 +02:00
2 changed files with 5 additions and 3 deletions
--- a/machines/dev/forgejo-ci/default.nix
+++ b/machines/dev/forgejo-ci/default.nix
@ -48,7 +48,7 @@ in
      };

      ## NOTE: This is a physical machine, so is not covered by disko
-      fileSystems."/" = {
+      fileSystems."/" = lib.mkForce {
        device = "rpool/root";
        fsType = "zfs";
      };
@ -58,7 +58,7 @@ in
        fsType = "zfs";
      };

-      fileSystems."/boot" = {
+      fileSystems."/boot" = lib.mkForce {
        device = "/dev/disk/by-uuid/50B2-DD3F";
        fsType = "vfat";
        options = [
--- a/services/fediversity/default.nix
+++ b/services/fediversity/default.nix
@ -70,7 +70,9 @@ in
  config = {
    ## FIXME: This should clearly go somewhere else; and we should have a
    ## `staging` vs. `production` setting somewhere.
-    security.acme = lib.mkDefault {
+    # use a priority higher than mkDefault for panel deployment to work,
+    # yet lower than default so this will not clash with the setting in tests.
+    security.acme = lib.modules.defaultOverridePriority {
      acceptTerms = true;
      defaults.email = "something@fediversity.net";
      # defaults.server = "https://acme-staging-v02.api.letsencrypt.org/directory";
Author	SHA1	Message	Date
Kiara Grouwstra	5282bb1b7e	still go thru shell to actually load it	2025-07-05 21:29:41 +02:00
Kiara Grouwstra	726336c081	pull `attic-client` into shell as CI is missing `<nixpkgs>` for `nix-shell`	2025-07-05 21:29:41 +02:00
Kiara Grouwstra	d55b2ad2c5	collapse caching ci test, given it seems to not carry over variables between steps	2025-07-05 21:29:41 +02:00
Kiara Grouwstra	565a69bc15	test attic cache from ci	2025-07-05 21:29:41 +02:00
Kiara Grouwstra	c8b1091548	allow consuming attic cache from ci runner	2025-07-05 21:29:41 +02:00
Kiara Grouwstra	eaf8ef0de5	enquote attic env values for use in `source attic.env`	2025-07-05 21:29:41 +02:00
Kiara Grouwstra	ff62e11374	add generator dependency	2025-07-05 21:29:41 +02:00
Nicolas “Niols” Jeannerod	77403bb3db	moar extraDependencies	2025-07-05 21:29:41 +02:00
Kiara Grouwstra	7a5bf158f6	[wip] handling env file (still fails) rm unused dep nix-templating fix imports	2025-07-05 21:29:41 +02:00
Kiara Grouwstra	c7f4f8fc8f	use templating fork	2025-07-05 21:29:41 +02:00
Kiara Grouwstra	c943409354	add tests, fix some things upgrade memory to resolve oom	2025-07-05 21:29:41 +02:00
Kiara Grouwstra	b0543ebfd8	move from dev to operator revert add qemu import	2025-07-05 21:29:41 +02:00
Kiara Grouwstra	f2546ef1a7	WIP: add attic cache, see #92 flesh out attic TODO keys nginx-port testing fix key fix key	2025-07-05 21:29:41 +02:00
Kiara Grouwstra	9b5de67b8e	ensure bare-metal `fileSystems` override default, resolves definition conflict on `nixops4 apply forgejo-ci`	2025-07-05 21:29:23 +02:00
Kiara Grouwstra	d9f2d942b2	resolve regressions from recent qemu files - move import to match module classes - manually import sources to resolve infinite recursion	2025-07-05 21:29:23 +02:00
Kiara Grouwstra	baaa990513	use defaultOverridePriority over mkDefault to fix acme error without cashing with settings from tests	2025-07-05 21:29:12 +02:00