Dawoox/nixpkgs
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/nextcloud-notify_push: remove not required mkMerge

Browse Source
This commit is contained in:
Marcel
2025-10-13 13:34:33 +02:00
committed by Sandro Jäckel
parent 0b4defa258
commit 2f00e84a4b
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,27 +159,24 @@ in
"::1" = [ cfgN.hostName ];
};
services = lib.mkMerge [
{
nginx.virtualHosts.${cfgN.hostName}.locations."^~ /push/" = {
proxyPass = "http://unix:${cfg.socketPath}";
proxyWebsockets = true;
recommendedProxySettings = lib.mkDefault true;
extraConfig = # nginx
''
# disable in case it was configured on a higher level
keepalive_timeout 0;
proxy_buffering off;
'';
};
}
(lib.mkIf cfg.bendDomainToLocalhost {
nextcloud.settings.trusted_proxies = [
services = {
nginx.virtualHosts.${cfgN.hostName}.locations."^~ /push/" = {
proxyPass = "http://unix:${cfg.socketPath}";
proxyWebsockets = true;
recommendedProxySettings = lib.mkDefault true;
extraConfig = # nginx
''
# disable in case it was configured on a higher level
keepalive_timeout 0;
proxy_buffering off;
'';
};
nextcloud = {
settings.trusted_proxies = lib.mkIf cfg.bendDomainToLocalhost [
"127.0.0.1"
"::1"
];
})
];
};
};
};
}