From c2542bd98bd8043218cf73b2aeb1bb39ffad3d24 Mon Sep 17 00:00:00 2001
From: Danilo Reyes <CaptainJawZ@protonmail.com>
Date: Sat, 6 Jul 2024 14:52:51 -0600
Subject: [PATCH] collabora disabled (broken)

---
 hosts/miniserver/configuration.nix |  6 +--
 modules/servers/nextcloud.nix      | 86 +++++++++++++++---------------
 2 files changed, 44 insertions(+), 48 deletions(-)

diff --git a/hosts/miniserver/configuration.nix b/hosts/miniserver/configuration.nix
index ea22ec8..e2f13e9 100644
--- a/hosts/miniserver/configuration.nix
+++ b/hosts/miniserver/configuration.nix
@@ -40,7 +40,7 @@
       adguardhome.enable = false;
       audiobookshelf.enable = true;
       bazarr.enable = false;
-      collabora.enable = true;
+      collabora.enable = false;
       flame.enable = true;
       flameSecret.enable = true;
       go-vod.enable = false;
@@ -117,9 +117,7 @@
       openFirewall = true;
       settings = {
         inotify = "yes";
-        media_dir = [
-          "/mnt/pool/"
-        ];
+        media_dir = [ "/mnt/pool/" ];
       };
     };
   };
diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix
index 8104859..3a31bc6 100644
--- a/modules/servers/nextcloud.nix
+++ b/modules/servers/nextcloud.nix
@@ -3,7 +3,7 @@ let
   inherit (config.my) localhost;
   collaboraPort = 9980;
   url = "cloud.${config.my.domain}";
-  urlSecret = "cloud.${config.my.domainSecret}";
+  urlSecret = "collabora.${config.my.domainSecret}";
   collaboraProxy = "http://${localhost}:${toString collaboraPort}";
   commonProxyConfig = ''
     proxy_set_header Host $host;
@@ -75,9 +75,9 @@ in {
           enableImagemagick = true;
           maxUploadSize = "16G";
           hostName = url;
-          extraApps = {
-            inherit (config.services.nextcloud.package.packages.apps) calendar;
-          };
+          # extraApps = {
+          #   inherit (config.services.nextcloud.package.packages.apps) calendar;
+          # };
           config = {
             adminpassFile = config.sops.secrets.nextcloud-adminpass.path;
             dbtype = "pgsql";
@@ -114,10 +114,9 @@ in {
             trusted_domains = [ "cloud.rotehaare.art" "danilo-reyes.com" ];
             overwrite_protocol = "https";
             default_phone_region = "MX";
-            "allow_local_remote_servers" = true;
+            allow_local_remote_servers = true;
             mail_smtpmode = "sendmail";
             mail_sendmailmode = "pipe";
-            "installed" = true;
             "memories.exiftool" =
               "/etc/profiles/per-user/nextcloud/bin/exiftool";
             enabledPreviewProviders = [
@@ -130,8 +129,8 @@ in {
               "OC\\Preview\\Movie"
             ];
           };
-          phpExtraExtensions = all: [ all.pdlib all.bz2 ];
-          # phpExtraExtensions = all: [ ];
+          # phpExtraExtensions = all: [ all.pdlib all.bz2 ];
+          phpExtraExtensions = all: [ ];
         };
         nginx = {
           enable = true;
@@ -147,39 +146,38 @@ in {
                   { };
               };
             };
-            "collabora.${config.my.domainSecret}" =
-              lib.mkIf config.my.servers.collabora.enable {
-                forceSSL = true;
-                enableACME = true;
-                http2 = true;
-                locations = {
-                  # static files
-                  "^~ /loleaflet" = {
-                    proxyPass = collaboraProxy;
-                    extraConfig = commonProxyConfig;
-                  };
-                  # WOPI discovery URL
-                  "^~ /hosting/discovery" = {
-                    proxyPass = collaboraProxy;
-                    extraConfig = commonProxyConfig;
-                  };
-                  # Capabilities
-                  "^~ /hosting/capabilities" = {
-                    proxyPass = collaboraProxy;
-                    extraConfig = commonProxyConfig;
-                  };
-                  # download, presentation, image upload and websocket
-                  "~ ^/lool" = {
-                    proxyPass = collaboraProxy;
-                    extraConfig = commonWebsocketConfig;
-                  };
-                  # Admin Console websocket
-                  "^~ /lool/adminws" = {
-                    proxyPass = collaboraProxy;
-                    extraConfig = commonWebsocketConfig;
-                  };
+            ${urlSecret} = lib.mkIf config.my.servers.collabora.enable {
+              forceSSL = true;
+              enableACME = true;
+              http2 = true;
+              locations = {
+                # static files
+                "^~ /loleaflet" = {
+                  proxyPass = collaboraProxy;
+                  extraConfig = commonProxyConfig;
+                };
+                # WOPI discovery URL
+                "^~ /hosting/discovery" = {
+                  proxyPass = collaboraProxy;
+                  extraConfig = commonProxyConfig;
+                };
+                # Capabilities
+                "^~ /hosting/capabilities" = {
+                  proxyPass = collaboraProxy;
+                  extraConfig = commonProxyConfig;
+                };
+                # download, presentation, image upload and websocket
+                "~ ^/lool" = {
+                  proxyPass = collaboraProxy;
+                  extraConfig = commonWebsocketConfig;
+                };
+                # Admin Console websocket
+                "^~ /lool/adminws" = {
+                  proxyPass = collaboraProxy;
+                  extraConfig = commonWebsocketConfig;
                 };
               };
+            };
           };
         };
       };
@@ -203,14 +201,14 @@ in {
           imageFile = pkgs.dockerTools.pullImage {
             imageName = "collabora/code";
             imageDigest =
-              "sha256:1747d1b58ac595df63fb651c4533983bbb556b0a5427f9a14dc4d9e75bda6aff";
-            sha256 = "sha256-sIGLGsHMYqkboMlRnSN6eiy+iyKYj+wKvt48Hxirp00=";
+              "sha256:1344721df441b7b59f6372a62cd46fa75c8bf02082edc64dfe9dade8c734085d";
+            sha256 = "sha256-pRhcSYdbMNNn3HQ8yTj+qetH4Ns7IPWOOQcmeLSNbIU=";
           };
           ports = [ "9980:9980" ];
           environment = {
             TZ = "America/Mexico_City";
-            domain = urlSecret;
-            aliasgroup1 = "${url}:443";
+            domain = "cloud.servidos.lat";
+            aliasgroup1 = "cloud.servidos.lat:443";
             aliasgroup2 = "cloud.rotehaare.art:443";
             dictionaries = "en_CA en_US es_MX es_ES fr_FR it pt_BR ru";
             extra_params = ''
@@ -218,7 +216,7 @@ in {
               --o:ssl.termination=true
             '';
           };
-          extraOptions = [ "--cap-add=MKNOD" ];
+          extraOptions = [ "--cap-add" "MKNOD" ];
         };
       };
       systemd = lib.mkIf config.my.servers.nextcloud.enableCron {