nixos/nextcloud-notify_push: remove not required mkMerge

2025-10-13 13:34:33 +02:00
parent 0b4defa258
commit 2f00e84a4b
1 changed files with 16 additions and 19 deletions
--- a/nixos/modules/services/web-apps/nextcloud-notify_push.nix
+++ b/nixos/modules/services/web-apps/nextcloud-notify_push.nix
@@ -159,8 +159,7 @@ in
      "::1" = [ cfgN.hostName ];
    };

-    services = lib.mkMerge [
-      {
+    services = {
      nginx.virtualHosts.${cfgN.hostName}.locations."^~ /push/" = {
        proxyPass = "http://unix:${cfg.socketPath}";
        proxyWebsockets = true;
@@ -172,14 +171,12 @@ in
            proxy_buffering off;
          '';
      };
-      }
-
-      (lib.mkIf cfg.bendDomainToLocalhost {
-        nextcloud.settings.trusted_proxies = [
+      nextcloud = {
+        settings.trusted_proxies = lib.mkIf cfg.bendDomainToLocalhost [
          "127.0.0.1"
          "::1"
        ];
-      })
-    ];
+      };
+    };
  };
 }