diff --git a/hosts/nixos/porthos/services.nix b/hosts/nixos/porthos/services.nix index ffd150a..109b4e5 100644 --- a/hosts/nixos/porthos/services.nix +++ b/hosts/nixos/porthos/services.nix @@ -95,9 +95,6 @@ in nextcloud = { enable = true; passwordFile = secrets."nextcloud/password".path; - collabora = { - enable = true; - }; }; nix-cache = { enable = true; diff --git a/modules/nixos/services/nextcloud/collabora.nix b/modules/nixos/services/nextcloud/collabora.nix deleted file mode 100644 index d62181f..0000000 --- a/modules/nixos/services/nextcloud/collabora.nix +++ /dev/null @@ -1,58 +0,0 @@ -# Document editor with Nextcloud -{ config, lib, ... }: -let - cfg = config.my.services.nextcloud.collabora; -in -{ - options.my.services.nextcloud.collabora = with lib; { - enable = mkEnableOption "Collabora integration"; - - port = mkOption { - type = types.port; - default = 9980; - example = 8080; - description = "Internal port for API"; - }; - }; - - config = lib.mkIf cfg.enable { - services.collabora-online = { - enable = true; - inherit (cfg) port; - - aliasGroups = [ - { - host = "https://collabora.${config.networking.domain}"; - # Allow using from nextcloud - aliases = [ "https://${config.services.nextcloud.hostName}" ]; - } - ]; - - settings = { - # Rely on reverse proxy for SSL - ssl = { - enable = false; - termination = true; - }; - }; - }; - - my.services.nginx.virtualHosts = { - collabora = { - inherit (cfg) port; - - extraConfig = { - # Too bad for the repetition... - locations."~ ^/cool/(.*)/ws$" = { - proxyPass = "http://127.0.0.1:${builtins.toString cfg.port}"; - proxyWebsockets = true; - }; - locations."^~ /cool/adminws" = { - proxyPass = "http://127.0.0.1:${builtins.toString cfg.port}"; - proxyWebsockets = true; - }; - }; - }; - }; - }; -} diff --git a/modules/nixos/services/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix index fe94177..e2c4746 100644 --- a/modules/nixos/services/nextcloud/default.nix +++ b/modules/nixos/services/nextcloud/default.nix @@ -4,10 +4,6 @@ let cfg = config.my.services.nextcloud; in { - imports = [ - ./collabora.nix - ]; - options.my.services.nextcloud = with lib; { enable = mkEnableOption "Nextcloud"; maxSize = mkOption {