diff --git a/flake.lock b/flake.lock index 337213b..f0ac774 100644 --- a/flake.lock +++ b/flake.lock @@ -51,11 +51,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1726574745, - "narHash": "sha256-RZGivKjrMpG43zrDi3mX45s2VEUiHeErKir/UJVunmA=", + "lastModified": 1726917160, + "narHash": "sha256-IZe3LIHywCj4OGIXg1cOIPmQgt/eHe1dtymEgDIuS7U=", "owner": "onny", "repo": "nixpkgs", - "rev": "1c57aee03339c5b1357eb35f4500cdad5e333b6d", + "rev": "fd993fb42f510f748206b471cc0d1d26e134eefb", "type": "github" }, "original": { diff --git a/vm-nextcloud.nix b/vm-nextcloud.nix index 5a4ad77..4c81151 100644 --- a/vm-nextcloud.nix +++ b/vm-nextcloud.nix @@ -10,7 +10,7 @@ ]; imports = [ - #./nextcloud-extras.nix + ./nextcloud-extras.nix "${inputs.keycloak-realms}/nixos/modules/services/web-apps/keycloak.nix" ]; @@ -19,7 +19,7 @@ (self: super: { # Remove first run wizard and password policy check from Nextcloud # package - nextcloud30 = super.nextcloud30.overrideAttrs (oldAttrs: rec { + nextcloud29 = super.nextcloud29.overrideAttrs (oldAttrs: rec { installPhase = oldAttrs.installPhase + '' mkdir -p $out/ cp -R . $out/ @@ -35,30 +35,31 @@ # Setup Nextcloud including apps services.nextcloud = { enable = true; - package = pkgs.nextcloud30; + package = pkgs.nextcloud29; hostName = "localhost"; extraApps = with config.services.nextcloud.package.packages.apps; { - inherit contacts calendar user_oidc hmr_enabler; + inherit contacts calendar user_oidc hmr_enabler; # whiteboard; }; extraAppsEnable = true; config = { adminuser = "admin"; adminpassFile = "${pkgs.writeText "adminpass" "test123"}"; }; - #ensureUsers = { - # admin = { - # email = "admin@localhost"; - # passwordFile = "${pkgs.writeText "password" "test123"}"; - # }; - # user1 = { - # email = "user1@localhost"; - # passwordFile = "${pkgs.writeText "password" "test123"}"; - # }; - # user2 = { - # email = "user2@localhost"; - # passwordFile = "${pkgs.writeText "password" "test123"}"; - # }; - #}; + # FIXME currently broken + ensureUsers = { + admin = { + email = "admin@localhost"; + passwordFile = "${pkgs.writeText "password" "test123"}"; + }; + user1 = { + email = "user1@localhost"; + passwordFile = "${pkgs.writeText "password" "test123"}"; + }; + user2 = { + email = "user2@localhost"; + passwordFile = "${pkgs.writeText "password" "test123"}"; + }; + }; phpPackage = lib.mkForce (pkgs.php.buildEnv { extensions = ({ enabled, all }: enabled ++ (with all; [ xdebug @@ -73,16 +74,16 @@ }; appstoreEnable = true; configureRedis = true; - #extraOCCCommands = '' - # ${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable cleanup - # ${config.services.nextcloud.occ}/bin/nextcloud-occ user_oidc:provider Keycloak \ - # --clientid="nextcloud" \ - # --clientsecret="4KoWtOWtg8xpRdAoorNan4PdfFMATo91" \ - # --discoveryuri="http://localhost:8081/realms/OIDCDemo/.well-known/openid-configuration" \ - # --unique-uid=0 \ - # --mapping-uid=preferred_username \ - # --no-interaction - #''; + extraOCCCommands = '' + ${config.services.nextcloud.occ}/bin/nextcloud-occ app:enable cleanup + ${config.services.nextcloud.occ}/bin/nextcloud-occ user_oidc:provider Keycloak \ + --clientid="nextcloud" \ + --clientsecret="4KoWtOWtg8xpRdAoorNan4PdfFMATo91" \ + --discoveryuri="http://localhost:8081/realms/OIDCDemo/.well-known/openid-configuration" \ + --unique-uid=0 \ + --mapping-uid=preferred_username \ + --no-interaction + ''; settings = { log_type = "file"; loglevel = 1;