homepage update

flake.lock

@@ -58,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711535911,
+        "lastModified": 1712745070,
-        "narHash": "sha256-SzgDrsyBskLyipFzsKwPOKP9FMgGB+6tUQ0VpeGQ/1Y=",
+        "narHash": "sha256-75kSMjyCD5/IliSPkBcBSBamwPYF30Ddr8Ef2XxDfiE=",
         "ref": "refs/heads/main",
-        "rev": "80221fa4d735fbc232d97d3384c8af0e40a4e331",
+        "rev": "c2650ecab1c7b9b2e10d690b40e82817d257b53a",
-        "revCount": 9,
+        "revCount": 28,
         "type": "git",
         "url": "https://git.sondell.org/glennwso/home.git"
       },

homepage.nix

@@ -13,7 +13,7 @@ in
       After="network-online.target";
     };
     serviceConfig = {
-      ExecStart = "${homepage}/bin/homepage -p ${port}";
+      ExecStart = "${homepage}/bin/home-prod -p ${port}";
       User= "sondell";
       Type= "simple";
     };

mail.nix

@@ -1,4 +1,8 @@
 { mailserver , ... }:
+let
+  domain = "sondell.org";
+  fqdn =  "mail.${domain}";
+in
 {
   imports = [
     mailserver
@@ -6,8 +10,8 @@
 
   mailserver = {
     enable = true;
-    fqdn = "mail.sondell.org";
+    fqdn = fqdn;
-    domains = [ "sondell.org" ];
+    domains = [ domain ];
 
     # A list of all login accounts. To create the password hashes, use
     # cat .secrets/nextadminpw | nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt' > .secrets/mailpw.hash
@@ -23,18 +27,18 @@
     certificateScheme = "acme-nginx";
   };
 
-  # services.roundcube = {
+  services.roundcube = {
-  #    enable = true;
+     enable = true;
-  #    # this is the url of the vhost, not necessarily the same as the fqdn of
+     # this is the url of the vhost, not necessarily the same as the fqdn of
-  #    # the mailserver
+     # the mailserver
-  #    hostName = "webmail.sondell.org";
+     hostName = "webmail.${domain}";
-  #    extraConfig = ''
+     extraConfig = ''
-  #      # starttls needed for authentication, so the fqdn required to match
+       # starttls needed for authentication, so the fqdn required to match
-  #      # the certificate
+       # the certificate
-  #      $config['smtp_server'] = "tls://${mailserver.fqdn}";
+       $config['smtp_server'] = "tls://${fqdn}";
-  #      $config['smtp_user'] = "%u";
+       $config['smtp_user'] = "%u";
-  #      $config['smtp_pass'] = "%p";
+       $config['smtp_pass'] = "%p";
-  #    '';
+     '';
-  # };
+  };
   
 }