From b1ca6e19148b33ea0acca0c3e0d1b7a9c7faeba1 Mon Sep 17 00:00:00 2001
From: Evan Cassidy <evanc@ulcompsoc.ie>
Date: Mon, 24 Jul 2023 13:49:27 +0000
Subject: [PATCH 1/4] [webmail] add webmail config

---
 applications/email.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/applications/email.nix b/applications/email.nix
index 0789f4d..26780b3 100644
--- a/applications/email.nix
+++ b/applications/email.nix
@@ -122,6 +122,18 @@
         serverName  = "${cfg.sub}.${cfg.domain}";
       };
     };
+    services.roundcube = {
+     enable = true;
+     # this is the url of the vhost, not necessarily the same as the fqdn of
+     # the mailserver
+     hostName = "${cfg.sub}.${cfg.domain}";
+     extraConfig = ''
+       # starttls needed for authentication, so the fqdn required to match
+       # the certificate
+       $config['smtp_server'] = "tls://${cfg.sub}.${cfg.domain}";
+       $config['smtp_user'] = "%u";
+       $config['smtp_pass'] = "%p";
+     '';
 
 #    systemd.services.dovecot2.serviceConfig = {
 #      # restart it daily, override default values

From 26746f212e4ca9bb875ef2e7958edacdaab0d6cd Mon Sep 17 00:00:00 2001
From: Evan Cassidy <evanc@ulcompsoc.ie>
Date: Mon, 24 Jul 2023 13:50:33 +0000
Subject: [PATCH 2/4] [webmail] typo

---
 applications/email.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/applications/email.nix b/applications/email.nix
index 26780b3..3f5b44e 100644
--- a/applications/email.nix
+++ b/applications/email.nix
@@ -134,7 +134,7 @@
        $config['smtp_user'] = "%u";
        $config['smtp_pass'] = "%p";
      '';
-
+    }
 #    systemd.services.dovecot2.serviceConfig = {
 #      # restart it daily, override default values
 #      Restart    = lib.mkForce "always";

From 2e3fedc93e52cc7312e5489d3f6fc3caf53367c7 Mon Sep 17 00:00:00 2001
From: Evan Cassidy <evanc@ulcompsoc.ie>
Date: Mon, 24 Jul 2023 13:51:37 +0000
Subject: [PATCH 3/4] [fmt] add source

---
 applications/email.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/applications/email.nix b/applications/email.nix
index 3f5b44e..81f385b 100644
--- a/applications/email.nix
+++ b/applications/email.nix
@@ -122,6 +122,8 @@
         serverName  = "${cfg.sub}.${cfg.domain}";
       };
     };
+
+    #https://nixos-mailserver.readthedocs.io/en/latest/add-roundcube.html
     services.roundcube = {
      enable = true;
      # this is the url of the vhost, not necessarily the same as the fqdn of

From 7912b4a8cfdc9e61e9690f41461f7753dd9c5326 Mon Sep 17 00:00:00 2001
From: Evan Cassidy <evanc@ulcompsoc.ie>
Date: Mon, 24 Jul 2023 15:17:41 +0000
Subject: [PATCH 4/4] [fmt]

---
 applications/email.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/applications/email.nix b/applications/email.nix
index 81f385b..d7399b3 100644
--- a/applications/email.nix
+++ b/applications/email.nix
@@ -125,17 +125,17 @@
 
     #https://nixos-mailserver.readthedocs.io/en/latest/add-roundcube.html
     services.roundcube = {
-     enable = true;
-     # this is the url of the vhost, not necessarily the same as the fqdn of
-     # the mailserver
-     hostName = "${cfg.sub}.${cfg.domain}";
-     extraConfig = ''
-       # starttls needed for authentication, so the fqdn required to match
-       # the certificate
-       $config['smtp_server'] = "tls://${cfg.sub}.${cfg.domain}";
-       $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 = "${cfg.sub}.${cfg.domain}";
+      extraConfig = ''
+        # starttls needed for authentication, so the fqdn required to match
+        # the certificate
+        $config['smtp_server'] = "tls://${cfg.sub}.${cfg.domain}";
+        $config['smtp_user'] = "%u";
+        $config['smtp_pass'] = "%p";
+      '';
     }
 #    systemd.services.dovecot2.serviceConfig = {
 #      # restart it daily, override default values