update to nextcloud 30

This commit is contained in:
Jonas Heinrich 2024-09-17 13:28:22 +00:00
parent 61ec48c576
commit 56a5379b83

View file

@ -10,7 +10,7 @@
]; ];
imports = [ imports = [
./nextcloud-extras.nix #./nextcloud-extras.nix
"${inputs.keycloak-realms}/nixos/modules/services/web-apps/keycloak.nix" "${inputs.keycloak-realms}/nixos/modules/services/web-apps/keycloak.nix"
]; ];
@ -19,7 +19,7 @@
(self: super: { (self: super: {
# Remove first run wizard and password policy check from Nextcloud # Remove first run wizard and password policy check from Nextcloud
# package # package
nextcloud29 = super.nextcloud29.overrideAttrs (oldAttrs: rec { nextcloud30 = super.nextcloud30.overrideAttrs (oldAttrs: rec {
installPhase = oldAttrs.installPhase + '' installPhase = oldAttrs.installPhase + ''
mkdir -p $out/ mkdir -p $out/
cp -R . $out/ cp -R . $out/
@ -35,7 +35,7 @@
# Setup Nextcloud including apps # Setup Nextcloud including apps
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud29; package = pkgs.nextcloud30;
hostName = "localhost"; hostName = "localhost";
extraApps = with config.services.nextcloud.package.packages.apps; { extraApps = with config.services.nextcloud.package.packages.apps; {
inherit contacts calendar user_oidc hmr_enabler; inherit contacts calendar user_oidc hmr_enabler;
@ -45,20 +45,20 @@
adminuser = "admin"; adminuser = "admin";
adminpassFile = "${pkgs.writeText "adminpass" "test123"}"; adminpassFile = "${pkgs.writeText "adminpass" "test123"}";
}; };
ensureUsers = { #ensureUsers = {
admin = { # admin = {
email = "admin@localhost"; # email = "admin@localhost";
passwordFile = "${pkgs.writeText "password" "test123"}"; # passwordFile = "${pkgs.writeText "password" "test123"}";
}; # };
user1 = { # user1 = {
email = "user1@localhost"; # email = "user1@localhost";
passwordFile = "${pkgs.writeText "password" "test123"}"; # passwordFile = "${pkgs.writeText "password" "test123"}";
}; # };
user2 = { # user2 = {
email = "user2@localhost"; # email = "user2@localhost";
passwordFile = "${pkgs.writeText "password" "test123"}"; # passwordFile = "${pkgs.writeText "password" "test123"}";
}; # };
}; #};
phpPackage = lib.mkForce (pkgs.php.buildEnv { phpPackage = lib.mkForce (pkgs.php.buildEnv {
extensions = ({ enabled, all }: enabled ++ (with all; [ extensions = ({ enabled, all }: enabled ++ (with all; [
xdebug xdebug
@ -73,16 +73,16 @@
}; };
appstoreEnable = true; appstoreEnable = true;
configureRedis = true; configureRedis = true;
extraOCCCommands = '' #extraOCCCommands = ''
${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable cleanup # ${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable cleanup
${config.services.nextcloud.occ}/bin/nextcloud-occ user_oidc:provider Keycloak \ # ${config.services.nextcloud.occ}/bin/nextcloud-occ user_oidc:provider Keycloak \
--clientid="nextcloud" \ # --clientid="nextcloud" \
--clientsecret="4KoWtOWtg8xpRdAoorNan4PdfFMATo91" \ # --clientsecret="4KoWtOWtg8xpRdAoorNan4PdfFMATo91" \
--discoveryuri="http://localhost:8081/realms/OIDCDemo/.well-known/openid-configuration" \ # --discoveryuri="http://localhost:8081/realms/OIDCDemo/.well-known/openid-configuration" \
--unique-uid=0 \ # --unique-uid=0 \
--mapping-uid=preferred_username \ # --mapping-uid=preferred_username \
--no-interaction # --no-interaction
''; #'';
settings = { settings = {
log_type = "file"; log_type = "file";
loglevel = 1; loglevel = 1;
@ -108,10 +108,10 @@
target = /home/onny/projects/nixos-nextcloud-testumgebung/cleanup; target = /home/onny/projects/nixos-nextcloud-testumgebung/cleanup;
cache = "none"; cache = "none";
}; };
"/var/lib/nextcloud/store-apps/files_mindmap2" = { #"/var/lib/nextcloud/store-apps/files_mindmap2" = {
target = /home/onny/projects/nixos-nextcloud-testumgebung/files_mindmap2; # target = /home/onny/projects/nixos-nextcloud-testumgebung/files_mindmap2;
cache = "none"; # cache = "none";
}; #};
#"/var/lib/nextcloud/server" = { #"/var/lib/nextcloud/server" = {
# target = /home/onny/projects/nixos-nextcloud-testumgebung/server; # target = /home/onny/projects/nixos-nextcloud-testumgebung/server;
# cache = "none"; # cache = "none";