From fb834ea41a0ac85e68cf7e5ffa1422f79f3343b2 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 29 Nov 2019 18:01:03 +1300 Subject: [PATCH] mail-server: disabled it for now, because it was not properly working --- configs/sputnik/configuration.nix | 2 +- configs/sputnik/mail-server.nix | 2 +- configs/workhorse/mail-fetcher.nix | 46 ++++++++++++++++++++++++++++++ system/desktop/mail-stuff.nix | 25 +++++++++++++++- 4 files changed, 72 insertions(+), 3 deletions(-) diff --git a/configs/sputnik/configuration.nix b/configs/sputnik/configuration.nix index 55f2236..32842f0 100644 --- a/configs/sputnik/configuration.nix +++ b/configs/sputnik/configuration.nix @@ -8,7 +8,7 @@ ./nginx.nix ./tinc.nix - ./mail-server.nix + # ./mail-server.nix ]; diff --git a/configs/sputnik/mail-server.nix b/configs/sputnik/mail-server.nix index 7d6a549..c67a2d7 100644 --- a/configs/sputnik/mail-server.nix +++ b/configs/sputnik/mail-server.nix @@ -45,7 +45,7 @@ enablePop3Ssl = true; # Enable the ManageSieve protocol - #enableManageSieve = true; + enableManageSieve = true; # whether to scan inbound emails for viruses (note that this requires at least # 1 Gb RAM for the server. Without virus scanning 256 MB RAM should be plenty) diff --git a/configs/workhorse/mail-fetcher.nix b/configs/workhorse/mail-fetcher.nix index 6da4148..c9f1bd8 100644 --- a/configs/workhorse/mail-fetcher.nix +++ b/configs/workhorse/mail-fetcher.nix @@ -37,6 +37,11 @@ source = toString ; requiredBy = ["fetchmail.service"]; }; + "gaykraft.root" = { + user = config.users.users.mailUser.name; + source = toString ; + requiredBy = ["fetchmail.service"]; + }; "c-base.palo" = { user = config.users.users.mailUser.name; source = toString ; @@ -84,6 +89,47 @@ }; notmuch.enable = true; }; + #gaykraft = { + # primary = false; + # address = "root@gaykraft.com"; + # aliases = [ ]; + # realName = "Ingolf Wagner"; + # userName = "root@gaykraft.com"; + # passwordCommand = "cat ${toString config.krops.userKeys."gaykraft.root".target}"; + # imap = { + # host = "mail.gaykraft.com"; + # port = 993; + # tls.certificatesFile = + # pkgs.writeText "gaykraft.pem" '' + # -----BEGIN CERTIFICATE----- + # MIIDfzCCAmcCFBMAAMjIQnhYR9w+KIlfG8zLhM06MA0GCSqGSIb3DQEBCwUAMH8x + # CzAJBgNVBAYTAlVLMRUwEwYDVQQIDAxXYXJ3aWNrc2hpcmUxEzARBgNVBAcMCkxl + # YW1pbmd0b24xEDAOBgNVBAoMB09yZ05hbWUxHDAaBgNVBAsME1NlY3VyaXR5IERl + # cGFydG1lbnQxFDASBgNVBAMMC2V4YW1wbGUuY29tMB4XDTE5MTEyNzAxNTU1NloX + # DTE5MTEyODAxNTU1NloweTELMAkGA1UEBhMCVUsxFTATBgNVBAgMDFdhcndpY2tz + # aGlyZTETMBEGA1UEBwwKTGVhbWluZ3RvbjEQMA4GA1UECgwHT3JnTmFtZTEWMBQG + # A1UECwwNSVQgRGVwYXJ0bWVudDEUMBIGA1UEAwwLZXhhbXBsZS5jb20wggEiMA0G + # CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAJwAMze7u3I3D2z2cT7IrBeyDHfdu + # 5kCK9jZbYoU4wT7kNz/hD3BVe8BvUSNAEVJk/oPaE6v5PuFT2hAasoOhEEEr5Tt4 + # xp1MRItjxu+SUs7uZ+LpocZC4NNGb6/LPcmgthC4w8jj/JtZmcoStFqAAOqkdb6d + # tuf5lYHPxdFKRw2wgc/4pQo2PeeWder8NFoILC7Yh12zab7H2camobbbJl4tZPvJ + # z1FBk0WfeZLsUZ+2tdtginTOszsjPngygsUdQVnxfQeWBkVFXcZTHg/fELaW5uwV + # E4WIE5PZASlVwYV+gRqwM0312VW8zGF/JnwMT9hlcA27mwLBK8C4KoxRAgMBAAEw + # DQYJKoZIhvcNAQELBQADggEBAIBWcdnQbRdgxI3DXCi+IY+u+0nGrt/dduDzSqlt + # y0AFpRat4CImtgaG0jb7BDDEWTCycYFB+ABqUovQcJ5jjR/aq8Rfj2QD3nqIButg + # PyQvyYn5Z5Rx6h9aF7IOu5Eo/r/a73zJXK6iOLoLhD/e2mSIsNCW8hfbSLgPdEHH + # S14BxfacU0u1Pyh1WNprZ0C1HkJPJ/A0MZYRy4bJ5tYSO+ddcmYHbj8/ds728i8U + # L6/ijQaZ0q+lO/IXUFYODLkRcFAitg3fp/rj6D0lRMGlZKdMgI1OT6ziZm/Y074I + # yRo1wgUnGy6BOCZeHnZ9xa/q6huv9QZZGt6VtQFgnKpNNOY= + # -----END CERTIFICATE----- + # ''; + # }; + # mbsync = { + # enable = true; + # create = "both"; + # }; + # notmuch.enable = true; + #}; pali_palo = { primary = false; address = "pali_palo@web.de"; diff --git a/system/desktop/mail-stuff.nix b/system/desktop/mail-stuff.nix index 4a88e9c..59db8a6 100644 --- a/system/desktop/mail-stuff.nix +++ b/system/desktop/mail-stuff.nix @@ -105,12 +105,12 @@ in realName = "Ingolf Wagner"; userName = "contact@ingolf-wagner.de"; passwordCommand = passcmd "mail/siteground/contact@ingolf-wagner.de"; + notmuch.enable = true; smtp = { host = "securees5.sgcpanel.com"; port = 587; tls.useStartTls = true; }; - notmuch.enable = true; msmtp = { enable = true; # msmtp --serverinfo --tls --tls-certcheck=off -a ingolf-wagner @@ -122,6 +122,29 @@ in key = "42AC51C9482D0834CF488AF1389EC2D64AC71EAC"; }; }; + gaykraft = { + primary = false; + address = "root@gaykraft.com"; + aliases = [ ]; + realName = "Ingolf Wagner"; + userName = "root@gaykraft.com"; + passwordCommand = "mail/gaykraft.com/root@gaykraft.com"; + mbsync = { + enable = true; + create = "both"; + }; + smtp = { + host = "mail.gaykraft.com"; + port = 587; + tls.useStartTls = true; + }; + msmtp = { + enable = true; + # msmtp --serverinfo --tls --tls-certcheck=off -a gaykraft + tls.fingerprint = "08:42:73:72:3E:68:7D:55:89:7A:30:02:4B:CD:30:35:F1:6D:3E:7A:DD:A8:B6:84:67:25:37:F0:4F:7F:86:FE"; + }; + notmuch.enable = true; + }; c-base = { primary = false; address = "palo@c-base.org";