Merge branch 'main' into feat/automated-account-deletion

.forgejo/workflows/check.yml

@@ -18,14 +18,20 @@ jobs:
           # Prevent cache garbage collection by creating GC roots
           mkdir -p /var/lib/gitea-runner/tankstelle/.local/state/nix/results
 
-          for target in $(nix flake show --json --all-systems | jq '
+          for target in $(nix flake show --json --all-systems | jq --raw-output '
             .["nixosConfigurations"] |
             to_entries[] |
-            .key
+            .key'
-            ' | tr -d '"'
           ); do
             nix --print-build-logs --verbose --accept-flake-config --access-tokens '' \
               build --out-link /var/lib/gitea-runner/tankstelle/.local/state/nix/results/"$target" ".#nixosConfigurations.${target}.config.system.build.toplevel"
           done
 
-          nix --print-build-logs --verbose --accept-flake-config --access-tokens '' flake check
+          for check in $(nix flake show --json --all-systems | jq --raw-output '
+            .checks."x86_64-linux" |
+            to_entries[] |
+            .key'
+          ); do
+            nix --print-build-logs --verbose --accept-flake-config --access-tokens '' \
+              build --out-link /var/lib/gitea-runner/tankstelle/.local/state/nix/results/"$check" ".#checks.x86_64-linux.${check}"
+          done

flake.nix

@@ -82,7 +82,7 @@
             master = import inputs.master { inherit system; };
           };
 
-          packages = import ./tests ({ inherit inputs self; } // args);
+          checks = import ./tests ({ inherit inputs self; } // args);
 
           devShells.default = pkgs.mkShell {
             buildInputs = with pkgs; [

hosts/nachtigall/configuration.nix

@@ -59,11 +59,16 @@
     database-password-file = config.age.secrets.keycloak-database-password.path;
   };
 
-  pub-solar-os.backups.stores.storagebox = {
+  pub-solar-os.backups.repos.storagebox = {
     passwordFile = config.age.secrets."restic-repo-storagebox".path;
     repository = "sftp:u377325@u377325.your-storagebox.de:/backups";
   };
 
+  systemd.services.postgresql = {
+    after = [ "var-lib-postgresql.mount" ];
+    requisite = [ "var-lib-postgresql.mount" ];
+  };
+
   # This value determines the NixOS release with which your system is to be
   # compatible, in order to avoid breaking some software such as database
   # servers. You should change this only after NixOS release notes say you

modules/backups/default.nix

@@ -13,14 +13,18 @@ let
   };
   # Type for a valid systemd unit option. Needed for correctly passing "timerConfig" to "systemd.timers"
   inherit (utils.systemdUtils.unitOptions) unitOption;
+  inherit (lib)
+    literalExpression
+    mkOption
+    mkPackageOption
+    types
+    ;
 in
 {
   options.pub-solar-os.backups = {
-    stores =
+    repos = mkOption {
-      with lib;
-      mkOption {
       description = ''
-          Periodic backups to create with Restic.
+        Configuration of Restic repositories.
       '';
       type = types.attrsOf (
         types.submodule (
@@ -57,9 +61,7 @@ in
       };
     };
 
-    backups =
+    backups = mkOption {
-      with lib;
-      mkOption {
       description = ''
         Periodic backups to create with Restic.
       '';
@@ -253,17 +255,17 @@ in
   config = {
     services.restic.backups =
       let
-        stores = config.pub-solar-os.backups.stores;
+        repos = config.pub-solar-os.backups.repos;
         backups = config.pub-solar-os.backups.backups;
 
-        storeNames = builtins.attrNames stores;
+        storeNames = builtins.attrNames repos;
         backupNames = builtins.attrNames backups;
 
         createBackups =
           backupName:
           map (storeName: {
             name = "${backupName}-${storeName}";
-            value = stores."${storeName}" // backups."${backupName}";
+            value = repos."${storeName}" // backups."${backupName}";
           }) storeNames;
 
       in

tests/keycloak.nix

@@ -83,9 +83,12 @@ in
       wmClass = su "${gdbus} ${gseval} global.display.focus_window.wm_class";
     in
     ''
+<<<<<<< HEAD
       def puppeteer_run(cmd):
           client.succeed(f'puppeteer-run \'{cmd}\' ')
 
+=======
+>>>>>>> main
       start_all()
 
       nachtigall.wait_for_unit("system.slice")
@@ -96,6 +99,7 @@ in
       nachtigall.wait_until_succeeds("curl https://auth.test.pub.solar/")
 
       client.wait_for_unit("system.slice")
+<<<<<<< HEAD
       client.wait_for_file("/tmp/puppeteer.sock")
       puppeteer_run('page.goto("https://auth.test.pub.solar")')
       puppeteer_run('page.waitForNetworkIdle()')
@@ -114,5 +118,10 @@ in
       puppeteer_run('page.locator("button::-p-text(Register)").click()')
       puppeteer_run('page.waitForNetworkIdle()')
       client.screenshot("after-register")
+=======
+      client.sleep(30)
+      # client.wait_until_succeeds("${wmClass} | grep -q 'firefox'")
+      client.screenshot("screen")
+>>>>>>> main
     '';
 }