teml

modules/nixos/services/collabora/default.nix

@@ -5,58 +5,50 @@
   ...
 }:
 let
-  inherit (lib.${namespace}) mkOpt mkReverseProxyOpt;
-  cfg = config.${namespace}.services.collabora;
-
+  name = "collabora";
+  cfg = config.${namespace}.services.${name};
   jwtSecretFile = config.sops.secrets."jallen-nas/onlyoffice-key".path;
-in
-{
-  options.${namespace}.services.collabora = with lib; {
-    enable = lib.mkEnableOption "";
 
-    port = mkOpt types.int 9980 "Port for opencloud to be hosted on";
+  collaboraConfig = lib.${namespace}.mkModule {
+    inherit config name;
+    description = "collabora code server";
+    options = { };
+    moduleConfig = {
+      services.collabora-online = {
+        enable = true;
+        port = cfg.port;
+        settings = {
+          # Rely on reverse proxy for SSL
+          ssl = {
+            enable = false;
+            termination = true;
+          };
 
-    configPath = mkOpt types.str "/media/nas/main/nix-app-data/collabora" "Path to the data dir";
+          # Listen on loopback interface only, and accept requests from ::1
+          net = {
+            listen = cfg.listenAddress;
+            post_allow.host = [
+              "cloud.mjallen.dev"
+              "office.mjallen.dev"
+              "10.0.1.3"
+              "10.0.1.0/24"
+            ];
+            frame_ancestors = "cloud.mjallen.dev";
+          };
 
-    puid = mkOpt types.str "911" "puid";
+          # Restrict loading documents from WOPI Host
+          storage.wopi = {
+            "@allow" = true;
+            host = ["cloud.mjallen.dev"];
+          };
 
-    pgid = mkOpt types.str "1000" "pgid";
-
-    timeZone = mkOpt types.str "America/Chicago" "container tz";
-  };
-
-  config = lib.mkIf cfg.enable {
-    services.collabora-online = {
-      enable = true;
-      port = cfg.port;
-      settings = {
-        # Rely on reverse proxy for SSL
-        ssl = {
-          enable = false;
-          termination = true;
+          # Set FQDN of server
+          server_name = "office.mjallen.dev";
         };
-
-        # Listen on loopback interface only, and accept requests from ::1
-        net = {
-          listen = "0.0.0.0";
-          post_allow.host = [
-            "cloud.mjallen.dev"
-            "office.mjallen.dev"
-            "10.0.1.3"
-            "10.0.1.0/24"
-          ];
-          frame_ancestors = "cloud.mjallen.dev";
-        };
-
-        # Restrict loading documents from WOPI Host
-        storage.wopi = {
-          "@allow" = true;
-          host = ["cloud.mjallen.dev"];
-        };
-
-        # Set FQDN of server
-        server_name = "office.mjallen.dev";
       };
     };
   };
+in
+{
+  imports = [ collaboraConfig ];
 }