malobeo/infrastructure
2
1
Fork 1
Code Issues 41 Pull Requests 4 Actions Projects 3 Releases Wiki Activity

Update to 26.05 #161

Open
ahtlon wants to merge 11 commits from 26_05_upgrade into master
pull from: 26_05_upgrade
merge into: malobeo:master
Conversation 6 Commits 11 Files Changed 8 +55 -50
ahtlon commented 2026-06-17 09:57:04 +02:00
Owner
Copy Link
No description provided.
ahtlon added 1 commit 2026-06-17 09:57:04 +02:00
Update to 26.05
Some checks failed
Hydra callback / on_pr (pull_request) Waiting to run
Details
Check flake syntax / flake-check (push) Failing after 3m41s
Details
Hydra callback / on_push (pull_request) Has been skipped
Details
1cc93d5dc2
kalipso commented 2026-06-17 11:06:10 +02:00
Owner
Copy Link
The option definition `services.promtail' in `/nix/store/gd2xdz7xz96q1pigd0bfm1ggqm1clcfb-source/machines/modules/malobeo/metrics.nix' no longer has any effect; please remove it.
       The promtail module has been removed, as promtail reached its end of life.
``` The option definition `services.promtail' in `/nix/store/gd2xdz7xz96q1pigd0bfm1ggqm1clcfb-source/machines/modules/malobeo/metrics.nix' no longer has any effect; please remove it. The promtail module has been removed, as promtail reached its end of life. ```
ahtlon added 3 commits 2026-06-17 11:29:51 +02:00
Promtail is EOL a575d16ec0 
Recomended migtration to grafana-alloy (https://grafana.com/docs/alloy/latest/set-up/migrate/from-promtail/) or fluent-bit (https://docs.fluentbit.io/manual/data-pipeline/outputs/loki)
I chose alloy because of the compatability.
This needs to be reworked to a native implementation later
Hardcode grafana security key 8c9b49f5c3 
Grafana's secret key (services.grafana.settings.security.secret_key) doesn't have a default  value anymore. Please generate your own and use a file-provider on this option! See also https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#secret_key for more information. See https://grafana.com/docs/grafana/latest/setup-grafana/configure-security/configure-database-encryption/#re-encrypt-secrets on how to re-encrypt.
As stated in the NixOS changelog for 26.05, there's no official way to rotate.
 Either hard-code the old key ("SW2YcwTIb9zpOOhoPsMm") if your setup doesn't have any secrets in the DB that need special protection or perform a rotation with a 3rd-party tool (d9dc788902).
Change credentialsFile to environmentFile
Some checks failed
Check flake syntax / flake-check (push) Has been cancelled
Details
Hydra callback / on_push (pull_request) Has been cancelled
Details
Hydra callback / on_pr (pull_request) Has been cancelled
Details
90d631f73c
ahtlon added 1 commit 2026-06-17 11:30:04 +02:00
change mpd config to declarative
Some checks failed
Check flake syntax / flake-check (push) Has been cancelled
Details
Hydra callback / on_push (pull_request) Has been cancelled
Details
Hydra callback / on_pr (pull_request) Has been cancelled
Details
b5b84e2ec8
ahtlon added 2 commits 2026-06-17 11:45:22 +02:00
[Nextcloud] build deck in flake 0b77bbd8a6 
Changes from a cloud filehost to a local build, should also be more maintainable
Multilingual keyword not supported
Some checks failed
Check flake syntax / flake-check (push) Has been cancelled
Details
Hydra callback / on_push (pull_request) Has been cancelled
Details
Hydra callback / on_pr (pull_request) Has been cancelled
Details
cf89ece4d6
ahtlon commented 2026-06-17 11:45:56 +02:00
Author
Owner
Copy Link

nix build .#nixosConfigurations.fanny.config.system.build.toplevel now builds without errors for me

nix build .\#nixosConfigurations.fanny.config.system.build.toplevel now builds without errors for me
ahtlon added 1 commit 2026-06-17 11:52:58 +02:00
[docs] update nextcloud instructions
Some checks failed
Hydra callback / on_push (pull_request) Has been skipped
Details
Hydra callback / on_pr (pull_request) Failing after 3h10m18s
Details
Check flake syntax / flake-check (push) Successful in 20m18s
Details
529848d89e
ahtlon requested review from kalipso 2026-06-17 11:53:35 +02:00
kalipso commented 2026-06-18 10:17:31 +02:00
Owner
Copy Link

Did you test these changes in vm? 0b77bbd8a6

I tried a similar approach in the past, but during nextclouds boot the deck module did not load properly

Did you test these changes in vm? https://git.dynamicdiscord.de/malobeo/infrastructure/commit/0b77bbd8a6fd46ea1f012e15a2f061ba946d60b6 I tried a similar approach in the past, but during nextclouds boot the deck module did not load properly
ahtlon commented 2026-06-18 20:08:01 +02:00
Author
Owner
Copy Link

Nach 4 stunden rumprobieren muss ich leider erstmal das handtuch werfen...
Problem ist das das plugin composer deps (dafür ist buildComposerProject2 da) aber auch npm deps für npm run build zum bauen braucht.
Ich habe versucht ne kombination zu schreiben

deck = pkgs.buildNpmPackage (finalAttrs: {
        pname = "deck";
        version = "0";
        src = pkgs.fetchFromGitHub {
          owner = "nextcloud";
          repo = "deck";
          rev = "2db3a31161c65b3d712c46d585b6478110689d91";
          hash = "sha256-SnfDRYFF05k/lIzoOZDL/9o/OqqpMBJhtVua0yhFBOM=";
        };
        npmDepsFetcherVersion = 2;
        npmDepsHash = "sha256-HeqKl9gBPb64XrYMfevRTvpq7dI2oNwzJFtZjf1hHm8=";
        patches = [ ./0001-Patch-cards-to-be-draggable.patch ];
        #nativeBuildInputs = [ pkgs.nodejs_24 pkgs.webpack-cli];
        forceEmptyCache = true;
        npmFlags = ["--prefer-online" "--legacy-peer-deps" "--verbose"];
        preBuild = ''
          composer install
          composer install --no-dev
        '';
        postInstall = ''
          chmod -R u+w $out/share
          mv $out/share/php/deck/* $out/
          rm -r $out/share $out/composer.* $out/Makefile $out/psalm.xml $out/tests
        '';
      });

aber die funktioniert nicht weil irgendeine npm dependency nicht gefunden wird.

Nach 4 stunden rumprobieren muss ich leider erstmal das handtuch werfen... Problem ist das das plugin composer deps (dafür ist buildComposerProject2 da) aber auch npm deps für `npm run build` zum bauen braucht. Ich habe versucht ne kombination zu schreiben ``` deck = pkgs.buildNpmPackage (finalAttrs: { pname = "deck"; version = "0"; src = pkgs.fetchFromGitHub { owner = "nextcloud"; repo = "deck"; rev = "2db3a31161c65b3d712c46d585b6478110689d91"; hash = "sha256-SnfDRYFF05k/lIzoOZDL/9o/OqqpMBJhtVua0yhFBOM="; }; npmDepsFetcherVersion = 2; npmDepsHash = "sha256-HeqKl9gBPb64XrYMfevRTvpq7dI2oNwzJFtZjf1hHm8="; patches = [ ./0001-Patch-cards-to-be-draggable.patch ]; #nativeBuildInputs = [ pkgs.nodejs_24 pkgs.webpack-cli]; forceEmptyCache = true; npmFlags = ["--prefer-online" "--legacy-peer-deps" "--verbose"]; preBuild = '' composer install composer install --no-dev ''; postInstall = '' chmod -R u+w $out/share mv $out/share/php/deck/* $out/ rm -r $out/share $out/composer.* $out/Makefile $out/psalm.xml $out/tests ''; }); ``` aber die funktioniert nicht weil irgendeine npm dependency nicht gefunden wird.
ahtlon added 2 commits 2026-06-18 20:11:32 +02:00
[nextcloud] undo the packaging change... 8de6687f1f
[nextcloud] update
Some checks failed
Check flake syntax / flake-check (push) Successful in 29m18s
Details
Hydra callback / on_pr (pull_request) Failing after 4m16s
Details
Hydra callback / on_push (pull_request) Has been skipped
Details
d7547be088
kalipso commented 2026-06-19 11:43:08 +02:00
Owner
Copy Link

I tried also different approaches already, available here: 669b355d99
I think the one that got the closest was using kankerl - a build tool for nextcloud apps. But even with successfull builds there was error during loading the app on runtime. I think combined we managed tody waste 8 hours on this alrea haha.

I tried also different approaches already, available here: https://git.dynamicdiscord.de/malobeo/infrastructure/commit/669b355d99640acf7055d5d3e941730b8016c465 I think the one that got the closest was using [kankerl](https://github.com/ChristophWurst/krankerl) - a build tool for nextcloud apps. But even with successfull builds there was error during loading the app on runtime. I think combined we managed tody waste 8 hours on this alrea haha.
kalipso commented 2026-06-19 11:46:52 +02:00
Owner
Copy Link

The mpd conf you converted to declarative doesnt seem to build: https://hydra.dynamicdiscord.de/build/1296/nixlog/457

Since we dont use lucia with mpd at the moment i suggest to just remove the mpd section for now.

The mpd conf you [converted to declarative](https://git.dynamicdiscord.de/malobeo/infrastructure/commit/b5b84e2ec868e9f003b63c6648d2f23e151a395e) doesnt seem to build: https://hydra.dynamicdiscord.de/build/1296/nixlog/457 Since we dont use lucia with mpd at the moment i suggest to just remove the mpd section for now.
ahtlon added 1 commit 2026-06-23 18:55:06 +02:00
[lucia] remove mpd
All checks were successful
Check flake syntax / flake-check (push) Successful in 24m16s
Details
Hydra callback / on_pr (pull_request) Successful in 6m52s
Details
Hydra callback / on_push (pull_request) Has been skipped
Details
379c6c83d2
All checks were successful
Check flake syntax / flake-check (push) Successful in 24m16s
Required
Details
Hydra callback / on_pr (pull_request) Successful in 6m52s
Required
Details
Hydra callback / on_push (pull_request) Has been skipped
Details
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin 26_05_upgrade:26_05_upgrade
git checkout 26_05_upgrade
Sign in to join this conversation.
Reviewers
No Reviewers
kalipso
Labels
Clear labels
Bug/Problem
Lokal
Migration
Module/Disks
Module/Initssh
Request
Security
Service
Updates
bump
nextcloud
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ahtlon kalipso quinn
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: malobeo/infrastructure#161
Delete Branch "26_05_upgrade"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?