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