From 2ede55a7eeb69b115b1439237616fe47f708ce1a Mon Sep 17 00:00:00 2001 From: Nick Date: Sun, 2 Feb 2025 21:16:28 -0600 Subject: [PATCH] feat: smtp test --- nixos/modules/services/forgejo.nix | 9 +++------ nixos/modules/services/mastodon/default.nix | 9 +++------ nixos/modules/services/peertube.nix | 5 +++-- secrets/secrets.yaml | 15 +++++---------- 4 files changed, 14 insertions(+), 24 deletions(-) diff --git a/nixos/modules/services/forgejo.nix b/nixos/modules/services/forgejo.nix index 632fe61..0a460ec 100755 --- a/nixos/modules/services/forgejo.nix +++ b/nixos/modules/services/forgejo.nix @@ -7,10 +7,7 @@ let inherit (flake.config.machines.devices) server ; - inherit (flake.config.services.instances) - forgejo - web - ; + inherit (flake.config.services.instances) smtp forgejo web; service = forgejo; localhost = web.localhost.address0; host = "${service.subdomain}.${web.domains.url3}"; @@ -48,11 +45,11 @@ in }; mailer = { ENABLED = true; - SMTP_ADDR = "smtp.protonmail.ch"; + SMTP_ADDR = smtp.hostname; FROM = service.email.address0; USER = service.email.address0; PROTOCOL = "smtp+starttls"; - SMTP_PORT = 587; + SMTP_PORT = smtp.ports.port0; SEND_AS_PLAIN_TEXT = true; USE_CLIENT_CERT = false; }; diff --git a/nixos/modules/services/mastodon/default.nix b/nixos/modules/services/mastodon/default.nix index 463f444..1c10ca9 100755 --- a/nixos/modules/services/mastodon/default.nix +++ b/nixos/modules/services/mastodon/default.nix @@ -9,10 +9,7 @@ let inherit (flake.config.machines.devices) server ; - inherit (flake.config.services.instances) - mastodon - web - ; + inherit (flake.config.services.instances) smtp mastodon web; service = mastodon; host = "${mastodon.subdomain}.${web.domains.url3}"; localhost = web.localhost.address0; @@ -109,9 +106,9 @@ in authenticate = true; createLocally = false; fromAddress = "upRootNutrition <${service.email.address0}>"; - host = "smtp.protonmail.ch"; + host = smtp.hostname; passwordFile = config.sops.secrets.mastodon-smtp.path; - port = 587; + port = smtp.ports.port0; user = service.email.address0; }; }; diff --git a/nixos/modules/services/peertube.nix b/nixos/modules/services/peertube.nix index 56ca553..fa27c99 100755 --- a/nixos/modules/services/peertube.nix +++ b/nixos/modules/services/peertube.nix @@ -11,6 +11,7 @@ let inherit (flake.config.services.instances) caddy peertube + smtp web ; service = peertube; @@ -55,8 +56,8 @@ in transport = "smtp"; disable_starttls = false; from_address = service.email.address0; - hostname = "smtp.protonmail.ch"; - port = 587; + hostname = smtp.hostname; + port = smtp.ports.port0; username = service.email.address0; tls = false; }; diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index f0c1dde..035cf5b 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -7,18 +7,16 @@ network: server: ENC[AES256_GCM,data:EFsmXNkuf5OAMh8hjfZTixmmdjqBNIME9JjQC8azeCwcMVInm8bWdxE4OqFmxOk9MAU=,iv:pI6WeM2aQC+7vx1Xmp5O2rikqNLgzuEOg+Lo7TqFQxU=,tag:ElcA8mn9dx+IjIf38nKT5A==,type:str] fallaryn: ENC[AES256_GCM,data:O77hH3STB6zpl0b9iXsVu9OOrlLKUwfs2qI9hdqX4kMuBs3XgT/xsQ==,iv:RDKsuJoy+LIyADMc3bgOEmLKdXtu6kad2aeVetuZdJI=,tag:MrpCZ+iJUnGIjeHMgcYG6Q==,type:str] garnet: ENC[AES256_GCM,data:N8sAdjTAiubQihKrtdCkaJQBKkz6/kNdeATiaZXRhlP/HLg7zg==,iv:8QP1HnGSUGHpkwBwQY2Z0gZ6tYaK7XzMuxXexY6QQaU=,tag:fHzPh9lvqB2BmuSkVH5Ojg==,type:str] -mastodon-smtp: ENC[AES256_GCM,data:kGCckgG9vSZYJv/8Z9e58g==,iv:Jw9hDAtVe7LmPpdy/nN0JD9T6j8/OHcFcYiuOjQmJuc=,tag:VlGkBZE5kkzXPgZPw9o49A==,type:str] +mastodon-smtp: ENC[AES256_GCM,data:8/uQKw0bmDrepKXSv0ausw==,iv:/Dn47RsjYSjGgFEf3BrLKrosTwqzpv4J5SCNFKczdIw=,tag:7GN8oYvXiZuRCPU6mh5Slg==,type:str] mastodon-database: ENC[AES256_GCM,data:qPOU8yGqEQWuMJ4E/fCc+vfKp+YZONb17ZIDHXYZ9RY=,iv:HzVd2ptZBtpRA/XA593WTNL3xJx97hvNx49zIZPBlhQ=,tag:KGZ7Mw2M5O9DBhB+fv+w1Q==,type:str] mastodon-redis: ENC[AES256_GCM,data:aEEOGmyLin80X1uNiLLIuCSGlGjYX9vOl45GuxwlJqE=,iv:3qaZAqwm6tLnB1vCtZ2ZotaZO4/XmQKLe/I+pzqbJj0=,tag:K1y1QoLgGRvi8oJrzcakhQ==,type:str] -peertube-smtp: ENC[AES256_GCM,data:YBqlU0FQ2hveRSTU3iWygQ==,iv:lpmfylfOdZYGg6vwCkDO/OIFeW9+7L5xzTCfiqHUDkA=,tag:VwxWLLCMJEm3W/THP97Puw==,type:str] +peertube-smtp: ENC[AES256_GCM,data:rBmjyf4J7fNbnKICkUIVIw==,iv:wbyTkVmBJLIB4yZibVpr3+6Jn/FMEQSSi7UFCtiCkUg=,tag:ByMTXTyyiys9ONekQGxsYw==,type:str] peertube-database: ENC[AES256_GCM,data:nm0bHwTcT+ROZc2BC9jx+tXWjZ3689rdn4fdYW+7JTU=,iv:EeQVBAIXPut9gs+I9WpRf7L3f7ACTeTWycUFIKAneKk=,tag:QjGQmZ3zMAgB/WDbxTZVIQ==,type:str] peertube-redis: ENC[AES256_GCM,data:SQoPzPjgf4YN9dhvO0wo2DEra7cTgfZBx4vCBpNVSXI=,iv:mcCwYtE9E/Mb4V0j9NnU9WhaUMeBpX7BOcc8HGDiEvI=,tag:CsSiS4peZhnZ22uNtUC44w==,type:str] peertube-root: ENC[AES256_GCM,data:BR0pmqEYYJuDqK7fstyW/hvh8V1GQXVHP24iz2eDeho500IbWaMuDxkNQyfInmIfjC3YvfsHME3S,iv:EgaLKBHYrklF+q5jBPvGKFYJosZxFFMXElTcyKU0ypQ=,tag:PztyBdK5OzeEDvQi/yqRIg==,type:str] peertube-secret: ENC[AES256_GCM,data:Of4UsWGTXd+uzHE4XkxQOLKBbDd0sQHWQrLgxmn8C9bHgEB85ZnSqOe04IZ4chYKheuzBQ4Vg7pYfGFVBDjx8Q==,iv:cXuVrmQOEHtq7Q6+vzPXKdiuYjLx9hjsd3bCHpBQBqw=,tag:xL8us1XLJsdON/O+BG+xpQ==,type:str] forgejo-database: ENC[AES256_GCM,data:Stnd+vsoBDK0eLmfgaNaSdO6qY0vF1d0WgrAw1U451I=,iv:7CHPXUPXkTXP0GVqHPK3KavysbSOKuUhJ5EoeAh5Mp4=,tag:iqASITas49wrqCRN8TjLIQ==,type:str] -forgejo-smtp: ENC[AES256_GCM,data:p+ARltehYqMTsiBg665PBg==,iv:uTM6Sps+4F4lEGSYUrnZYHcYSNNgpUEsxGT1TxEPUyY=,tag:pz3PN+63i/C6BPdZgy6Q5A==,type:str] -websitecastopod-smtp: ENC[AES256_GCM,data:4uyom6zG4z24f1UZywzNNq5YN94fXsu3bA==,iv:e/XsyU3QVlMxYwZ4c5iiUd4MzJZ7TZm+Wl6Zmo4II1I=,tag:lTLizICQQJaKgcj+o8Z30A==,type:str] -castopod-database: ENC[AES256_GCM,data:Yn2pHEzoEC1ZH0LVaFooHX2TzkM0V6PUboXrziIIYA0=,iv:U+oXBBmn5Yohq5Gx6N5jo2x/eRMXK8pjnxBDCMxD2Oo=,tag:i+xZW7S+tLdive+cyZpTew==,type:str] +forgejo-smtp: ENC[AES256_GCM,data:hp1MPgzdSdgBZ47KQ+/QvQ==,iv:l/C7FFvyxPo/ndJWhOSThYUGbUZnk1WBdpCGNtnL4iE=,tag:61OGP00MTPYfmoq8yK4vEQ==,type:str] discord-token: ENC[AES256_GCM,data:PQ4VEKZUCFdSau9hHj52GkdKTnc1sdNIOrJjWbW0Wu9gNAluOutbEYd21UjP9nW/8ayPrId5dSGs6pqXQEIxT8KmnYVQXQYQ6i5xx9Ciq77pU1MipXE=,iv:lpOWnuySeLDiZMSjbsnQJCgsC3PG3v9hmaPVenlmF5g=,tag:Wdpwagj6iiiif5MZiW+yzQ==,type:str] minecraft-pass: ENC[AES256_GCM,data:0natV6dEpItFp5zsUKqgVMZLLmqRLBEf,iv:Bc7RTXnpdec0wn25Rb7SkVTf5BjXzq3YCXcjwrC7V9k=,tag:Og5qN94G6pHdpIk6YDg1ZA==,type:str] vaultwarden: @@ -30,9 +28,6 @@ nextcloud-user0: ENC[AES256_GCM,data:yUZruPJ4s2Svvh6Q0f4C4lgcKCcWJDMw8CpT8cXv3m4 nextcloud-user1: ENC[AES256_GCM,data:6EsbSeWWftPjZQM=,iv:LTcx6fx55d3+SepFIoy/6cBdbgaauDeo0gvq9ACCtHA=,tag:uzoATR3ZL2Uk5z6aMiD/yw==,type:str] nextcloud-user2: ENC[AES256_GCM,data:axrWMmouq5gwqdGL,iv:BPHEn47z2g7gocKO4g5vV4ZSGb+AMA3vGYheAy1zR5Q=,tag:QOWg4fdKxMhGk2qRehH2EQ==,type:str] nextcloud-user3: ENC[AES256_GCM,data:g6ldEdtBuEmPAQYAQfaO,iv:6fElE2vZh9l/KgJuNevklpIlZZdqGHgwhnOzq1n3ojE=,tag:T0Q1IkdVTeW2T1FmGnjz8A==,type:str] -wiki-js: - pass: ENC[AES256_GCM,data:O7m5SAnwbzq/GIKxNBtDCUVpccsaE1pOs6o+quZCe/EFMElNy019J7w=,iv:bMlBND1IQ5Lxu/7lwURZfcLx4tL+7st2xZh/ne/HH7Q=,tag:/589ca3f1Y+EjKd7sJLsJQ==,type:str] - ssh: ENC[AES256_GCM,data:bhOQ2Cr9NZuCAPZttbRyEbzk08AOnxTF/5OsPkb4NNvO43X+ulIjM84pynTzeONnaBPQrq+XTXkL6jmtHzkBeZQMKeg110rWagWZfspQGOm1xT4SRgbqGjmz9pkgwlDPG2s8C/7NhPY0zPArnTJOosT3bmCANerg/WgFxv/aOqDEVzqZfqQK9t7PgFpTg2IFSIulYTys1Pwj4CA3RD9pUdW/QIUuUgAOkbHQQ2Ibo3bRR5k8nuOZe23PXt0VeT/aQ+SoK/OkkJ88+hzz2aphq3EPV/O8UeZqqcVQcVtUeG1/89eSOxwsrmiO940rh2fp3LjLTzNmpXTSjf/rxzMibKavx84TlO47FJXc0pEXJbJHdvDFta61DfQezy7pogN6ivrsE5jdL5ysJmYSePlM6z447sMZFJsRAT8QyzOA+QUvAAirY0aQfp4eBLv1XUkiXaaSb+ghP1+MqN2k9zglGXAUG5Yt6e5TLKXfDynqiVSMqywDfT8W2FrbZDSmTIVF2Bf6g1KNIv+VwJ+oeuJh,iv:EGtjs6C68rIRlOA8k0szd50zXWnL3CmEHZ4BalscqZk=,tag:LzJARDpS1N010Bskz3E4WQ==,type:str] claude-api-key: ENC[AES256_GCM,data:QzGJPBnqx4PrDjNvGeyjl0B/W9pkBS4YWK/lrDK4sx0/eBbwMk2qvi03wOhVfvz71UVRpDIZ0F3eVtB8h8Nr94Ha/8IlFQtKxrh60XIzUs/GLB2jKZursZny8IjqZMrt9YHFOphqAWawB33g,iv:XKPqQ0sGukhy0bPXATYwjJMAfSkXdeanc4kULb5TWmA=,tag:vmH+pzU5qoOF5W0fhVfhDA==,type:str] sops: kms: [] @@ -49,8 +44,8 @@ sops: bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-02-03T02:39:04Z" - mac: ENC[AES256_GCM,data:lTlu5Xxc3mf+9oWnSy+J7lHbecOZKSzoHkEJn8hxpDMcyyiGFwGFvzAF4dKpvaEtC5nyhnkc+SSksD0POrp3z+9/35RQotaqBZxIGKUxzgeQC520m/3E+Xk/kGPiQSW13diLJS/3fV0jpvP61C67VazRWbEDmyFBNiTOT7ugCi0=,iv:mpftsKWKPFgoEhus+t9CDPV3KbfJthXSdtXzSubl2VE=,tag:6d33SoOvx03TDOZHV7DusQ==,type:str] + lastmodified: "2025-02-03T03:16:19Z" + mac: ENC[AES256_GCM,data:zoMaGiNDQ8bZwXbmgwTK07F8mGh7HZnaMPRdcftpiy1t5HuYKXU8CdiaREaGozCyIrgvTHbtQjjtL1KFTzpCkN1+bEpL+VA75vEzAkeoImRCFNMnTVdc2I5Bo0nOg8OW5HwI7Ezdv2ZrSd3qG7YW2WZHpctvOgWAoWv2z2zGHX8=,iv:1qs7/7aQ88JbAr3wEk70t/JmxfvfIAMSWXKckPmYg74=,tag:0Tpls8L13wU4WdMU4v4e5w==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.4