From 978f0a537c03c8269cbd75fea8f6257af7c1966d Mon Sep 17 00:00:00 2001 From: Kabbone Date: Sun, 26 Jan 2025 20:53:09 +0100 Subject: [PATCH] server: enable onlyoffice again --- modules/services/server/nextcloud.nix | 46 ++++++++++++--------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/modules/services/server/nextcloud.nix b/modules/services/server/nextcloud.nix index 3f9c005..4036225 100644 --- a/modules/services/server/nextcloud.nix +++ b/modules/services/server/nextcloud.nix @@ -1,10 +1,6 @@ { config, pkgs, ... }: { - environment.systemPackages = with pkgs; [ # Default packages install system-wide - appimage-run - ]; - services.nextcloud = { enable = true; hostName = "cloud.kabtop.de"; @@ -47,15 +43,15 @@ #autoUpdateApps.enable = true; }; -# services.onlyoffice = { -# enable = true; -# hostname = "docs.cloud.kabtop.de"; -# postgresName = "onlyoffice"; -# postgresHost = "localhost"; -# postgresUser = "onlyoffice"; -# postgresPasswordFile = config.age.secrets."services/nextcloud/onlyofficedb".path; -# jwtSecretFile = config.age.secrets."services/nextcloud/onlyofficejwt".path; -# }; + services.onlyoffice = { + enable = true; + hostname = "docs.cloud.kabtop.de"; + postgresName = "onlyoffice"; + postgresHost = "localhost"; + postgresUser = "onlyoffice"; + postgresPasswordFile = config.age.secrets."services/nextcloud/onlyofficedb".path; + jwtSecretFile = config.age.secrets."services/nextcloud/onlyofficejwt".path; + }; services.redis = { vmOverCommit = true; @@ -73,10 +69,10 @@ enableACME = true; forceSSL = true; }; -# "${config.services.onlyoffice.hostname}" = { -# enableACME = true; -# forceSSL = true; -# }; + "${config.services.onlyoffice.hostname}" = { + enableACME = true; + forceSSL = true; + }; }; }; @@ -88,14 +84,14 @@ file = ../../../secrets/services/nextcloud/adminpassFile.age; owner = "nextcloud"; }; -# age.secrets."services/nextcloud/onlyofficedb" = { -# file = ../../../secrets/services/nextcloud/onlyofficedb.age; -# owner = "onlyoffice"; -# }; -# age.secrets."services/nextcloud/onlyofficejwt" = { -# file = ../../../secrets/services/nextcloud/onlyofficejwt.age; -# owner = "onlyoffice"; -# }; + age.secrets."services/nextcloud/onlyofficedb" = { + file = ../../../secrets/services/nextcloud/onlyofficedb.age; + owner = "onlyoffice"; + }; + age.secrets."services/nextcloud/onlyofficejwt" = { + file = ../../../secrets/services/nextcloud/onlyofficejwt.age; + owner = "onlyoffice"; + }; systemd.services."nextcloud-setup" = { requires = ["postgresql.service"];