1 files changed, 14 insertions, 11 deletions
diff --git a/system/mail/default.nix b/system/mail/default.nix
index 98af119..7a206f5 100644
--- a/system/mail/default.nix
+++ b/system/mail/default.nix
@@ -10,19 +10,8 @@ in {
   fqdn = "server1.vhack.eu";
   domains = ["vhack.eu"];
 
-  enableImap = false;
-  enableImapSsl = true;
-  enablePop3 = false;
-  enablePop3Ssl = true;
-  # SMTP
-  enableSubmission = false;
-  enableSubmissionSsl = true;
   useFsLayout = true;
 
-  mailDirectory = "/srv/mail/vmail";
-  dkimKeyDirectory = "/srv/mail/dkim";
-  backup.snapshotRoot = "/srv/mail/backup";
-
   loginAccounts = {
     "sils@vhack.eu" = {
       hashedPassword = "$2b$05$RW/Svgk7iGxvP5W7ZwUZ1e.a3fj4fteevb2MtfFYYD0d1DQ17y9Fm";
@@ -35,7 +24,21 @@ in {
     "admin@vhack.eu" = all_admins;
   };
 
+
+  mailDirectory = "/srv/mail/vmail";
+  dkimKeyDirectory = "/srv/mail/dkim";
   sieveDirectory = "/srv/mail/sieve";
+  backup.snapshotRoot = "/srv/mail/backup";
+
+
+  enableImap = false;
+  enableImapSsl = true;
+  enablePop3 = false;
+  enablePop3Ssl = true;
+  # SMTP
+  enableSubmission = false;
+  enableSubmissionSsl = true;
+
   keyFile = "/var/lib/acme/server1.vhack.eu/key.pem";
   certificateScheme = 1;
   certificateFile = "/var/lib/acme/server1.vhack.eu/fullchain.pem";