From dde5366d896b2026154f4d02b061845283ea822d Mon Sep 17 00:00:00 2001
From: oqyude <oqyude@gmail.com>
Date: Fri, 19 Sep 2025 21:44:35 +0300
Subject: [PATCH] 123

---
 nixosModules/server/nextcloud.nix | 56 +++++++++++++++----------------
 nixosModules/server/nginx.nix     |  6 ++--
 nixosModules/vds/nginx.nix        | 13 +------
 3 files changed, 32 insertions(+), 43 deletions(-)

diff --git a/nixosModules/server/nextcloud.nix b/nixosModules/server/nextcloud.nix
index 9fd0980..0b4d6c6 100755
--- a/nixosModules/server/nextcloud.nix
+++ b/nixosModules/server/nextcloud.nix
@@ -103,7 +103,7 @@
     };
     onlyoffice = {
       enable = true;
-      hostname = "localhost:8980";
+      hostname = "localhost";
     };
     rabbitmq.enable = true;
   };
@@ -119,34 +119,34 @@
     ];
   };
 
-  systemd.services.nextcloud-config-collabora =
-    let
-      inherit (config.services.nextcloud) occ;
+  # systemd.services.nextcloud-config-collabora =
+  #   let
+  #     inherit (config.services.nextcloud) occ;
 
-      wopi_url = "http://[::1]:${toString config.services.collabora-online.port}";
-      public_wopi_url = "https://collabora.zeroq.ru";
-      wopi_allowlist = lib.concatStringsSep "," [
-        "127.0.0.1"
-        "::1"
-      ];
-    in
-    {
-      wantedBy = [ "multi-user.target" ];
-      after = [
-        "nextcloud-setup.service"
-        "coolwsd.service"
-      ];
-      requires = [ "coolwsd.service" ];
-      script = ''
-        ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url}
-        ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url}
-        ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist}
-        ${occ}/bin/nextcloud-occ richdocuments:setup
-      '';
-      serviceConfig = {
-        Type = "oneshot";
-      };
-    };
+  #     wopi_url = "http://[::1]:${toString config.services.collabora-online.port}";
+  #     public_wopi_url = "https://collabora.zeroq.ru";
+  #     wopi_allowlist = lib.concatStringsSep "," [
+  #       "127.0.0.1"
+  #       "::1"
+  #     ];
+  #   in
+  #   {
+  #     wantedBy = [ "multi-user.target" ];
+  #     after = [
+  #       "nextcloud-setup.service"
+  #       "coolwsd.service"
+  #     ];
+  #     requires = [ "coolwsd.service" ];
+  #     script = ''
+  #       ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url}
+  #       ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url}
+  #       ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist}
+  #       ${occ}/bin/nextcloud-occ richdocuments:setup
+  #     '';
+  #     serviceConfig = {
+  #       Type = "oneshot";
+  #     };
+  #   };
 
   fileSystems."/mnt/nextcloud" = {
     device = "${xlib.dirs.nextcloud-folder}";
diff --git a/nixosModules/server/nginx.nix b/nixosModules/server/nginx.nix
index f20e2d2..47369ee 100755
--- a/nixosModules/server/nginx.nix
+++ b/nixosModules/server/nginx.nix
@@ -27,17 +27,17 @@
             }
           ];
         };
-        "localhost:9980" = {
+        "localhost" = {
           forceSSL = false;
           enableACME = false;
           listen = [
             {
               addr = "100.64.0.0";
-              port = 9980;
+              port = 8080;
             }
             {
               addr = "192.168.1.20";
-              port = 9980;
+              port = 8080;
             }
           ];
         };
diff --git a/nixosModules/vds/nginx.nix b/nixosModules/vds/nginx.nix
index ae60100..6a087fb 100755
--- a/nixosModules/vds/nginx.nix
+++ b/nixosModules/vds/nginx.nix
@@ -20,23 +20,12 @@ in
           enableACME = true;
           forceSSL = true;
           locations."/" = {
-            proxyPass = "http://${server}:9980";
+            proxyPass = "http://${server}:8080";
             proxyWebsockets = true; # collabora uses websockets
           };
         };
         "immich.zeroq.ru" = {
           # 31.57.105.253
-          # listen = [
-          #   {
-          #     addr = "0.0.0.0";
-          #     port = 80;
-          #   }
-          #   {
-          #     addr = "0.0.0.0";
-          #     port = 443;
-          #     ssl = true;
-          #   }
-          # ];
           forceSSL = true;
           enableACME = true;
           locations = {