fricloud/server-configs
2
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

switched from unstable to 25.05 instead. However, Nextcloud admin reset is broken

Browse source
This commit is contained in:
eyjhb 2025-05-31 13:55:31 +02:00
parent 54c4361f64
commit eb034b35d9
Signed by: eyjhb
GPG key ID: 609F508E3239F920
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
machines/gerd/services/nextcloud.nix
View file

@ -127,7 +127,7 @@ let
in { in {
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud30; package = pkgs.nextcloud31;
datadir = stateDir; datadir = stateDir;
config.adminpassFile = config.age.secrets.nextcloud-admin-pass.path; config.adminpassFile = config.age.secrets.nextcloud-admin-pass.path;
@ -200,7 +200,9 @@ in {
# runs this after all the main nextcloud-setup stuff # runs this after all the main nextcloud-setup stuff
script = lib.mkAfter '' script = lib.mkAfter ''
${nextcloudSetupLdap} ${nextcloudSetupLdap}
${nextcloudSetupAdmin} # TODO(eyJhb): fix, broken by upstream here
# https://github.com/NixOS/nixpkgs/commit/2ce1e841032eac4913f2cd3dce416da3d5c799ef
# ${nextcloudSetupAdmin}
${nextcloudSetupEncryption} ${nextcloudSetupEncryption}
${nextcloudSetupStorageQuota} ${nextcloudSetupStorageQuota}
''; '';

8
shared/sources/sources.json
View file

@ -67,15 +67,15 @@
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs": { "nixpkgs": {
"branch": "nixos-unstable", "branch": "nixos-25.05",
"description": "Nix Packages collection", "description": "Nix Packages collection",
"homepage": null, "homepage": null,
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4faa5f5321320e49a78ae7848582f684d64783e9", "rev": "7282cb574e0607e65224d33be8241eae7cfe0979",
"sha256": "1fcmsax6cs1s6p9apzxg17why08xy47dz226wnb5wwr0aargqlj2", "sha256": "0klkpy7ah033y3cwj51a0l96lwmkqqvwgfv3kid4z9x5g2rqr0l5",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/4faa5f5321320e49a78ae7848582f684d64783e9.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/7282cb574e0607e65224d33be8241eae7cfe0979.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }