Change domain to fqdn and extraDomains to domains

1 files changed, 10 insertions, 12 deletions

diff --git a/nixops/single-server.nix b/nixops/single-server.nix
index af909d1..abcd671 100644
--- a/nixops/single-server.nix
+++ b/nixops/single-server.nix
@@ -10,23 +10,21 @@
 
         mailserver = {
           enable = true;
-          domain = "example.com";
-          extraDomains = [ "example2.com" ];
-
-          hostPrefix = "mail";
+          fqdn = "mail.example.com";
+          domains = [ "example.com", "example2.com" ];
           loginAccounts = {
-              "user1" = {
+              "user1@example.com" = {
                   hashedPassword = "$6$/z4n8AQl6K$kiOkBTWlZfBd7PvF5GsJ8PmPgdZsFGN1jPGZufxxr60PoR0oUsrvzm2oQiflyz5ir9fFJ.d/zKm/NgLXNUsNX/";
               };
           };
           virtualAliases = {
-              "info" = "user1";
-              "postmaster" = "user1";
-              "abuse" = "user1";
-              "user1@example2.com" = "user1";
-              "info@example2.com" = "user1";
-              "postmaster@example2.com" = "user1";
-              "abuse@example2.com" = "user1";
+              "info@example.com" = "user1@example.com";
+              "postmaster@example.com" = "user1@example.com";
+              "abuse@example.com" = "user1@example.com";
+              "user1@example2.com" = "user1@example.com";
+              "info@example2.com" = "user1@example.com";
+              "postmaster@example2.com" = "user1@example.com";
+              "abuse@example2.com" = "user1@example.com";
           };
         };
     };