m

1 files changed, 19 insertions, 15 deletions

diff --git a/hosts/cloud/span/mail.nix b/hosts/cloud/span/mail.nix
index d020fec..9cc44a7 100644
--- a/hosts/cloud/span/mail.nix
+++ b/hosts/cloud/span/mail.nix
@@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     (builtins.fetchTarball {
       url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-23.11/nixos-mailserver-nixos-23.11.tar.gz";
@@ -9,11 +13,11 @@
     })
   ];
 
-  services.dovecot2.sieve.extensions = [ "fileinto" ];
+  services.dovecot2.sieve.extensions = ["fileinto"];
   mailserver = {
     enable = true;
     fqdn = "mail.spandrell.ch";
-    domains = [ "spandrell.ch" ];
+    domains = ["spandrell.ch"];
 
     # A list of all login accounts. To create the password hashes, use
     # nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
@@ -28,7 +32,7 @@
         hashedPasswordFile = "/home/span/mail.key";
       };
       "lol@spandrell.ch" = {
-        hashedPasswordFile = "/home/span/mail.key";
+        hashedPasswordFile = "/home/span/mail2.key";
       };
       "sub@spandrell.ch" = {
         hashedPasswordFile = "/home/span/mail.key";
@@ -51,17 +55,17 @@
   security.acme.acceptTerms = true;
   security.acme.defaults.email = "security@spandrell.ch";
   services.roundcube = {
-     enable = true;
-     # this is the url of the vhost, not necessarily the same as the fqdn of
-     # the mailserver
-     hostName = "mail.spandrell.ch";
-     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";
-     '';
+    enable = true;
+    # this is the url of the vhost, not necessarily the same as the fqdn of
+    # the mailserver
+    hostName = "mail.spandrell.ch";
+    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";
+    '';
   };
   services.nginx.enable = true;
 }