From 8a1f1cce311c968471418932dc34ac9c49f3b162 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Tue, 7 Jan 2025 13:35:36 -0500
Subject: [PATCH] Add back nextcloud and try collabora

---
 modules/system/secrets/default.nix            | Bin 1790 -> 1901 bytes
 modules/system/services/server/default.nix    |   3 +-
 .../services/server/fileserver/default.nix    |   8 -----
 .../server/fileserver/samba/default.nix       |  26 --------------
 .../server/fileserver/seafile/default.nix     |  12 -------
 .../fileserver/seafile/nginx/default.nix      |  17 ----------
 .../server/nextcloud/collabora/default.nix    |   6 ++++
 .../services/server/nextcloud/default.nix     |  32 ++++++++++++++++++
 .../server/nextcloud/nginx/default.nix        |  18 ++++++++++
 .../server/{fileserver => }/nfs/default.nix   |   0
 modules/system/settings/nix/gc/default.nix    |   2 +-
 11 files changed, 59 insertions(+), 65 deletions(-)
 delete mode 100644 modules/system/services/server/fileserver/default.nix
 delete mode 100644 modules/system/services/server/fileserver/samba/default.nix
 delete mode 100644 modules/system/services/server/fileserver/seafile/default.nix
 delete mode 100644 modules/system/services/server/fileserver/seafile/nginx/default.nix
 create mode 100644 modules/system/services/server/nextcloud/collabora/default.nix
 create mode 100644 modules/system/services/server/nextcloud/default.nix
 create mode 100644 modules/system/services/server/nextcloud/nginx/default.nix
 rename modules/system/services/server/{fileserver => }/nfs/default.nix (100%)

diff --git a/modules/system/secrets/default.nix b/modules/system/secrets/default.nix
index be5c2a83573564e8ae048912d559634e146281e6..19439f234b36c6a9a3bbaa909189c2b58c424651 100644
GIT binary patch
literal 1901
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

literal 1790
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
W-zm38X{C%AO{_b;SoJge_W}S0AbUdq

diff --git a/modules/system/services/server/default.nix b/modules/system/services/server/default.nix
index 7481d000..9b1b4909 100644
--- a/modules/system/services/server/default.nix
+++ b/modules/system/services/server/default.nix
@@ -3,12 +3,13 @@
   imports = [
     ./acme
     ./ddclient
-    ./fileserver
     ./forgejo
     ./icecast
     ./mailserver
     ./minecraft
     ./mysql
+    ./nextcloud
+    ./nfs
     ./nginx
     ./social
     ./transmission
diff --git a/modules/system/services/server/fileserver/default.nix b/modules/system/services/server/fileserver/default.nix
deleted file mode 100644
index 3ff4afca..00000000
--- a/modules/system/services/server/fileserver/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./nfs
-    ./samba
-    ./seafile
-  ];
-}
diff --git a/modules/system/services/server/fileserver/samba/default.nix b/modules/system/services/server/fileserver/samba/default.nix
deleted file mode 100644
index 7e2ef8d8..00000000
--- a/modules/system/services/server/fileserver/samba/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ config, lib, ... }:
-{
-  services = lib.mkIf config.system.server.enable {
-    samba = {
-      enable = true;
-      openFirewall = true;
-      settings = {
-        global = {
-          "workgroup" = "WORKGROUP";
-          "server string" = "NixSMB";
-          "security" = "user";
-          "hosts allow" = "${config.ips.localSpan}. 127.0.0.1 localhost";
-          "hosts deny" = "0.0.0.0/0";
-          "guest account" = "nobody";
-          "map to guest" = "bad user";
-        };
-      };
-    };
-
-    # Advertise to Windows
-    samba-wsdd = {
-      enable = true;
-      openFirewall = true;
-    };
-  };
-}
diff --git a/modules/system/services/server/fileserver/seafile/default.nix b/modules/system/services/server/fileserver/seafile/default.nix
deleted file mode 100644
index c43d614d..00000000
--- a/modules/system/services/server/fileserver/seafile/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, ... }:
-{
-  imports = [ ./nginx ];
-
-  services.seafile = {
-    enable = config.system.server.enable;
-    adminEmail = "jimbo@${config.domains.p2}";
-    initialAdminPassword = config.secrets.mainAccPass;
-    ccnetSettings.General.SERVICE_URL = "https://sync.${config.domains.p2}";
-    seafileSettings.fileserver.host = "unix:/run/seafile/server.sock";
-  };
-}
diff --git a/modules/system/services/server/fileserver/seafile/nginx/default.nix b/modules/system/services/server/fileserver/seafile/nginx/default.nix
deleted file mode 100644
index 3146ab1e..00000000
--- a/modules/system/services/server/fileserver/seafile/nginx/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ lib, config, ... }:
-{
-  services.nginx.virtualHosts."sync.${config.domains.p2}" = lib.mkIf config.services.seafile.enable {
-    enableACME = true;
-    forceSSL = true;
-    locations = {
-      "/" = {
-        proxyPass = "http://unix:/run/seahub/gunicorn.sock";
-        proxyWebsockets = true;
-      };
-      "/seafhttp" = {
-        proxyPass = "http://unix:/run/seafile/server.sock";
-        proxyWebsockets = true;
-      };
-    };
-  };
-}
diff --git a/modules/system/services/server/nextcloud/collabora/default.nix b/modules/system/services/server/nextcloud/collabora/default.nix
new file mode 100644
index 00000000..045250e6
--- /dev/null
+++ b/modules/system/services/server/nextcloud/collabora/default.nix
@@ -0,0 +1,6 @@
+{ config, lib, ... }:
+{
+  services.collabora-online = {
+    enable = true;
+  };
+}
diff --git a/modules/system/services/server/nextcloud/default.nix b/modules/system/services/server/nextcloud/default.nix
new file mode 100644
index 00000000..b0dd15de
--- /dev/null
+++ b/modules/system/services/server/nextcloud/default.nix
@@ -0,0 +1,32 @@
+{ pkgs, config, ... }:
+{
+  imports = [
+    ./collabora
+    ./nginx
+  ];
+
+  services.nextcloud = {
+    enable = config.system.server.enable;
+    package = pkgs.nextcloud30;
+    hostName = "cloud.${config.domains.p2}";
+    datadir = "/mnt/nextcloud";
+    https = true;
+    config = {
+      adminuser = config.sysusers.main;
+      adminpassFile = "${pkgs.writeText "initial" config.secrets.initialPass}";
+    };
+    settings = {
+      trusted_proxies = [ "127.0.0.1" ];
+      trusted_domains = [ "cloud.${config.domains.p2}" ];
+      overwriteprotocol = "https";
+      mail_smtphost = "mx.${config.domains.p1}";
+      mail_domain = "${config.domains.p1}";
+      mail_from_address = "noreply";
+      mail_smtpauth = "true";
+      mail_smtpname = "noreply@${config.domains.p2}";
+      mail_smtppassword = config.secrets.noreplyPassword;
+      mail_smtpmode = "smtp";
+      mail_smtpport = 587;
+    };
+  };
+}
diff --git a/modules/system/services/server/nextcloud/nginx/default.nix b/modules/system/services/server/nextcloud/nginx/default.nix
new file mode 100644
index 00000000..61df13e1
--- /dev/null
+++ b/modules/system/services/server/nextcloud/nginx/default.nix
@@ -0,0 +1,18 @@
+{ lib, config, ... }:
+{
+  services.nginx.virtualHosts."cloud.${config.domains.p2}" = lib.mkIf config.services.nextcloud.enable {
+    enableACME = true;
+    addSSL = true;
+    locations."/" = {
+      proxyWebsockets = true;
+      extraConfig = ''
+        location /.well-known/carddav {
+          return 301 $scheme://$host/remote.php/dav;
+        }
+        location /.well-known/caldav {
+          return 301 $scheme://$host/remote.php/dav;
+        }
+     '';
+    };
+  };
+}
diff --git a/modules/system/services/server/fileserver/nfs/default.nix b/modules/system/services/server/nfs/default.nix
similarity index 100%
rename from modules/system/services/server/fileserver/nfs/default.nix
rename to modules/system/services/server/nfs/default.nix
diff --git a/modules/system/settings/nix/gc/default.nix b/modules/system/settings/nix/gc/default.nix
index dd5e751f..0ec262af 100644
--- a/modules/system/settings/nix/gc/default.nix
+++ b/modules/system/settings/nix/gc/default.nix
@@ -3,6 +3,6 @@
   nix.gc = {
     automatic = true;
     dates = "weekly";
-    options = "--delete-older-than 1w";
+    options = "--delete-older-than 7d";
   };
 }