onny/nixos-nextcloud-testumgebung
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update to nextcloud30

Browse source
This commit is contained in:
Jonas Heinrich 2024-09-21 12:07:31 +00:00
parent 56a5379b83
commit 14c3c659bd
2 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -51,11 +51,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1726574745, "lastModified": 1726917160,
"narHash": "sha256-RZGivKjrMpG43zrDi3mX45s2VEUiHeErKir/UJVunmA=", "narHash": "sha256-IZe3LIHywCj4OGIXg1cOIPmQgt/eHe1dtymEgDIuS7U=",
"owner": "onny", "owner": "onny",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1c57aee03339c5b1357eb35f4500cdad5e333b6d", "rev": "fd993fb42f510f748206b471cc0d1d26e134eefb",
"type": "github" "type": "github"
}, },
"original": { "original": {

57
vm-nextcloud.nix
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
nextcloud30 = super.nextcloud30.overrideAttrs (oldAttrs: rec { nextcloud29 = super.nextcloud29.overrideAttrs (oldAttrs: rec {
installPhase = oldAttrs.installPhase + '' installPhase = oldAttrs.installPhase + ''
mkdir -p $out/ mkdir -p $out/
cp -R . $out/ cp -R . $out/
@ -35,30 +35,31 @@
# Setup Nextcloud including apps # Setup Nextcloud including apps
services.nextcloud = { services.nextcloud = {
enable = true; enable = true;
package = pkgs.nextcloud30; package = pkgs.nextcloud29;
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; # whiteboard;
}; };
extraAppsEnable = true; extraAppsEnable = true;
config = { config = {
adminuser = "admin"; adminuser = "admin";
adminpassFile = "${pkgs.writeText "adminpass" "test123"}"; adminpassFile = "${pkgs.writeText "adminpass" "test123"}";
}; };
#ensureUsers = { # FIXME currently broken
# admin = { ensureUsers = {
# email = "admin@localhost"; admin = {
# passwordFile = "${pkgs.writeText "password" "test123"}"; email = "admin@localhost";
# }; passwordFile = "${pkgs.writeText "password" "test123"}";
# user1 = { };
# email = "user1@localhost"; user1 = {
# passwordFile = "${pkgs.writeText "password" "test123"}"; email = "user1@localhost";
# }; passwordFile = "${pkgs.writeText "password" "test123"}";
# user2 = { };
# email = "user2@localhost"; user2 = {
# passwordFile = "${pkgs.writeText "password" "test123"}"; email = "user2@localhost";
# }; 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 +74,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;