diff --git a/hosts/home-server.nix b/hosts/home-server.nix index 81fd976..2ce7e10 100644 --- a/hosts/home-server.nix +++ b/hosts/home-server.nix @@ -140,7 +140,8 @@ in { enable = true; method = "email"; email.mailTo = "admin@felschr.com"; - email.mailFrom = "${config.networking.hostName} "; + email.mailFrom = + "${config.networking.hostName} <${config.msmtp.accounts.default.from}>"; }; # only change this when specified in release notes diff --git a/secrets/smtp.age b/secrets/smtp.age index 3599025..ea0b165 100644 --- a/secrets/smtp.age +++ b/secrets/smtp.age @@ -1,13 +1,14 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9BWlFoQSB0RklM -d0xRYUVaNzZwUFkzUXBMWkt4OGhwdW9XZE5EcnNPVlJ1blllakRVCkdyM0s3UUp4 -cXZ4cFZXblQ5YTRPaHN2VXZxN1BBSW5oK0xSOTFDZzlXMTgKLT4gc3NoLWVkMjU1 -MTkgbEphS25BIFhYekRPSjdiSXhNblk1TE1mQS9HMzNHSGxyMk84VWZuQ1FkYmRR -SUU2WEUKdU1xekdFd2tQMTRyQ1V4dklmczR2ZENucXJNQnkwaTIxRXhQTlBEVkZF -OAotPiBzc2gtZWQyNTUxOSA3MmlqN3cgRmxWazJQM3Y4MVJFQVg0SnRCK045NWxW -ck91VUoreGJCM2t0VnNTczVUTQpnNmtkS0gzR0pEZU5yeEZ5cytHSmN1emZBYVNx -WkFpL1pqVXV6a0tlbi9ZCi0+IGkuLWdyZWFzZSByLjIgd05JNkIgKmZuZSBPClYz -cm1heWl4anFRWFZJVXlGY2sKLS0tIDFSeDZpQTBBc1ZqTlVpNlZ1c0VTdGVLL1ND -K3pxdEVqeG1zYnRsalBCaEUKjMz5p1vxanyJzOKq0RdXoYBckYkB5swgHJv1gFF6 -VBbJusPAD6kbmmhwr4eJCknc7N/6vsnNRpH40rP2/7eEXhtLn5/cmUFR+A== +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IE9BWlFoQSBYa0RL +TlBrSCt1NFRFNzRrdi8zVWZVVnp4TXBGWjRWYTM2djR2Tnh6MHhrClRxUG9aUVVY +KzNQZDBQNVBsS2VsS2MzM0Fsa2lxVFpSSlVVSmNOTDB3WlkKLT4gc3NoLWVkMjU1 +MTkgbEphS25BIFFrbytEZHJ1R1JMZUUxMCt4dzRsd0V0WmZhNDhlcnhsYWhSZWxY +RkVmd1kKbW16bisrNnh3ZkVXM2U2UzZpcHpKaUJqTmJpZHREQjhPVytpbks2d3hw +dwotPiBzc2gtZWQyNTUxOSA3MmlqN3cgdXBjK09zTzFKR1NXMld1MWFPQlJ2Y1lV +MENMR3pCYlRIOEtQOC9hZXZpMApHMllBZ3h6dUxqV2tXTmhPb0NhQVVKaEd0SUg2 +cldHdVJ2QmszekdBME9nCi0+IC1oaEgtZ3JlYXNlIGlqQCl5LVx2IHw0UGVPKCVo +IFUmXmwsbyB3CjZxdnFMZkMvQlRDbnJnQXdlMzZ4eVZ1NmVKK1prYzQxU2JnCi0t +LSB0Ly9mUnZDTlBRMEdhTjE2UzBPVDcrSUxXbk9GbGNVMnljY1hnTjBReGY4CkRA +UPSVOZ2KTavgDM1jPwDgINtwTRGpbGCFJCXENzoiArATxvyYF2IjlXdO4udAy5VB +JvEbZ6VrwtBOi6Sd183O -----END AGE ENCRYPTED FILE----- diff --git a/services/mail.nix b/services/mail.nix index dda7586..a9a29ed 100644 --- a/services/mail.nix +++ b/services/mail.nix @@ -14,15 +14,14 @@ tls_starttls = true; auth = true; }; - accounts.default = rec { + accounts.default = { tls = true; tls_starttls = true; - host = "smtp.web.de"; + host = "in-v3.mailjet.com"; port = 587; - user = "felschr@web.de"; + user = "8f445e9664e3668e7c859bfcf189e71e"; passwordeval = "cat ${config.age.secrets.smtp.path}"; - # from = "%U@server.felschr.com"; - from = user; + from = "admin@felschr.com"; }; };