talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixos/nextcloud: unify usage of lib functions

Browse Source
This commit is contained in:
6543 2025-07-28 16:12:36 +02:00
parent 90b8f9db64
commit f7611cad51
1 changed files with 519 additions and 522 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
nixos/modules/services/web-apps/nextcloud.nix
View File

@ -5,11 +5,6 @@
... ...
}: }:
let let
inherit (lib)
mkIf
mkMerge
;
cfg = config.services.nextcloud; cfg = config.services.nextcloud;
overridePackage = cfg.package.override { overridePackage = cfg.package.override {
@ -1024,7 +1019,8 @@ in
}; };
}; };
config = mkIf cfg.enable (mkMerge [ config = lib.mkIf cfg.enable (
lib.mkMerge [
{ {
warnings = warnings =
let let
@ -1078,14 +1074,14 @@ in
pkgs.nextcloud31 pkgs.nextcloud31
); );
services.nextcloud.phpOptions = mkMerge [ services.nextcloud.phpOptions = lib.mkMerge [
(lib.mapAttrs (lib.const lib.mkOptionDefault) defaultPHPSettings) (lib.mapAttrs (lib.const lib.mkOptionDefault) defaultPHPSettings)
{ {
upload_max_filesize = cfg.maxUploadSize; upload_max_filesize = cfg.maxUploadSize;
post_max_size = cfg.maxUploadSize; post_max_size = cfg.maxUploadSize;
memory_limit = cfg.maxUploadSize; memory_limit = cfg.maxUploadSize;
} }
(mkIf cfg.caching.apcu { (lib.mkIf cfg.caching.apcu {
"apc.enable_cli" = "1"; "apc.enable_cli" = "1";
}) })
]; ];
@ -1289,7 +1285,7 @@ in
LoadCredential = runtimeSystemdCredentials; LoadCredential = runtimeSystemdCredentials;
}; };
}; };
nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable { nextcloud-update-plugins = lib.mkIf cfg.autoUpdateApps.enable {
after = [ "nextcloud-setup.service" ]; after = [ "nextcloud-setup.service" ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
@ -1396,7 +1392,7 @@ in
]; ];
}; };
services.postgresql = mkIf pgsqlLocal { services.postgresql = lib.mkIf pgsqlLocal {
enable = true; enable = true;
ensureDatabases = [ cfg.config.dbname ]; ensureDatabases = [ cfg.config.dbname ];
ensureUsers = [ ensureUsers = [
@ -1414,7 +1410,7 @@ in
services.nextcloud = { services.nextcloud = {
caching.redis = lib.mkIf cfg.configureRedis true; caching.redis = lib.mkIf cfg.configureRedis true;
settings = mkMerge [ settings = lib.mkMerge [
{ {
datadirectory = lib.mkDefault "${datadir}/data"; datadirectory = lib.mkDefault "${datadir}/data";
trusted_domains = [ cfg.hostName ]; trusted_domains = [ cfg.hostName ];
@ -1560,7 +1556,8 @@ in
''; '';
}; };
} }
]); ]
);
meta.doc = ./nextcloud.md; meta.doc = ./nextcloud.md;
meta.maintainers = lib.teams.nextcloud.members; meta.maintainers = lib.teams.nextcloud.members;