feat: flake.lock update

flake.lock

@@ -28,17 +28,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1709843377,
-        "narHash": "sha256-lQGd4xtKWsIlD5vVurrA/xtNYxYFGfLGyev4oOUeMmY=",
-        "ref": "master",
-        "rev": "1f1fcc223be4c6ae65eef1d50918aed0826e5ad1",
-        "revCount": 1259,
+        "lastModified": 1717701247,
+        "narHash": "sha256-MiP9/qgfxEFG0XrsNhKxKkct4g+ucNpxzUdN9c5Kklg=",
+        "ref": "refs/heads/master",
+        "rev": "8c753730c41fe9f2ba281bcabc76808bf61754fc",
+        "revCount": 1306,
         "type": "git",
-        "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git"
+        "url": "https://git.selfprivacy.org/def/selfprivacy-rest-api.git"
       },
       "original": {
         "type": "git",
-        "url": "https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git"
+        "url": "https://git.selfprivacy.org/def/selfprivacy-rest-api.git"
       }
     }
   },

flake.nix

@@ -5,7 +5,7 @@
     nixpkgs.url = github:nixos/nixpkgs;
 
     selfprivacy-api.url =
-      git+https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git;
+      git+https://git.selfprivacy.org/def/selfprivacy-rest-api.git;
     # make selfprivacy-api use the same shared nixpkgs
     selfprivacy-api.inputs.nixpkgs.follows = "nixpkgs";
   };

sp-modules/roundcube/config-paths-needed.json

@@ -0,0 +1,15 @@
+[
+  [
+    "selfprivacy",
+    "domain"
+  ],
+  [
+    "selfprivacy",
+    "modules",
+    "roundcube"
+  ],
+  [
+    "mailserver",
+    "fqdn"
+  ]
+]

sp-modules/roundcube/flake.nix

@@ -0,0 +1,9 @@
+{
+  description = "Roundcube is a web-based email client.";
+
+  outputs = { self }: {
+    nixosModules.default = import ./module.nix;
+    configPathsNeeded =
+      builtins.fromJSON (builtins.readFile ./config-paths-needed.json);
+  };
+}

sp-modules/roundcube/module.nix

@@ -0,0 +1,35 @@
+{ config, lib, ... }:
+let
+  domain = config.selfprivacy.domain;
+  cfg = config.selfprivacy.modules.roundcube;
+in
+{
+  options.selfprivacy.modules.roundcube = {
+    enable = lib.mkOption {
+      default = false;
+      type = lib.types.bool;
+    };
+    subdomain = lib.mkOption {
+      default = "roundcube";
+      type = lib.types.strMatching "[A-Za-z0-9][A-Za-z0-9\-]{0,61}[A-Za-z0-9]";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+
+  services.roundcube = {
+    enable = true;
+    # this is the url of the vhost, not necessarily the same as the fqdn of
+    # the mailserver
+    hostName = "${cfg.subdomain}.${config.selfprivacy.domain}";
+    extraConfig = ''
+      # starttls needed for authentication, so the fqdn required to match
+      # the certificate
+      $config['smtp_server'] = "tls://${config.mailserver.fqdn}";
+      $config['smtp_user'] = "%u";
+      $config['smtp_pass'] = "%p";
+    '';
+  };
+};
+}
+

sp-modules/simple-nixos-mailserver/config.nix

@@ -89,4 +89,5 @@ lib.mkIf sp.modules.simple-nixos-mailserver.enable
 
     virusScanning = false;
   };
+
 }