Unverified Commit 2f00e84a authored by Marcel's avatar Marcel Committed by Sandro Jäckel
Browse files

nixos/nextcloud-notify_push: remove not required mkMerge

parent 0b4defa2

nixos/modules/services/web-apps/nextcloud-notify_push.nix

+16 −19
Original line number Diff line number Diff line
@@ -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"

        ];

      })

    ];

      };

    };

  };

}