From d68e26828669648f5f91ac0a44a56a5f5193a432 Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Thu, 19 Jun 2025 13:47:16 -0700 Subject: turn on the Collabora backend service Change-Id: I144a170de1d943caae2e77ef0121d448764741b1 --- flake.lock | 8 ++++---- flake.nix | 3 ++- services/documents.nix | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 services/documents.nix diff --git a/flake.lock b/flake.lock index d9326af..eb2003b 100644 --- a/flake.lock +++ b/flake.lock @@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1750133334, + "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "36ab78dab7da2e4e27911007033713bab534187b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 3d15290..e1136ba 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-24.11"; + ref = "nixos-25.05"; }; }; @@ -16,6 +16,7 @@ nixosModules.default = { ... }: { imports = [ ./services/common/database.nix + ./services/documents.nix ./services/mattermost.nix ]; }; diff --git a/services/documents.nix b/services/documents.nix new file mode 100644 index 0000000..b438e9e --- /dev/null +++ b/services/documents.nix @@ -0,0 +1,18 @@ +{ config, pkgs, lib, ... }: + +{ + services.collabora-online = { + enable = true; + + # This is the default, set explicitly here to make it easier to find. + port = 9980; + + settings = { + # The service is behind our reverse proxy, so we need to tell it so. + ssl = { + enable = false; + termination = true; + }; + }; + }; +} -- cgit 1.4.1