configure an email server for lemmy prod

diff --git a/hosts/more/configuration.nix b/hosts/more/configuration.nix
index 73d6f3b04bd3ad4dc639c52f7824728dfd7ba2c7..cf2a60afc542d93eb4cdf85f76641c9b507a29a7 100644 (file)
--- a/hosts/more/configuration.nix
+++ b/hosts/more/configuration.nix
@@ -4,7 +4,7 @@
   imports = [
     ../../hardware/hetzner-cloud/cpx31.nix
     ../../secrets
-    ../../lemmy
+    ../../lemmy/prod
     ../../git/proxy-pass.nix
     ../../maint-mode
   ];

diff --git a/lemmy/prod/default.nix b/lemmy/prod/default.nix
index c615c02aa56e388e8b3a87250a45ff9c6abb28dc..f7c48b8876b1c8488975cef6aaf70a4ff9c64a8f 100644 (file)
--- a/lemmy/prod/default.nix
+++ b/lemmy/prod/default.nix
@@ -32,13 +32,13 @@
         admin_password = config.sops.placeholder."lemmy/initial_admin_password";
       };
 
-      # email = {
-      #   smtp_server = config.sops.placeholder."lemmy/smtp_server";
-      #   smtp_login = config.sops.placeholder."lemmy/smtp_login";
-      #   smtp_password = config.sops.placeholder."lemmy/smtp_password";
-      #   smtp_from_address = config.sops.placeholder."lemmy/smtp_from_address";
-      #   tls_type = "tls";
-      # };
+      email = {
+        smtp_server = config.sops.placeholder."lemmy/smtp_server";
+        smtp_login = config.sops.placeholder."lemmy/smtp_login";
+        smtp_password = config.sops.placeholder."lemmy/smtp_password";
+        smtp_from_address = config.sops.placeholder."lemmy/smtp_from_address";
+        tls_type = "starttls";
+      };
     });
 
   systemd.services.lemmy-prod = {

diff --git a/lemmy/staging/default.nix b/lemmy/staging/default.nix
index 58f3a8240396362f3fec96f8ad862f0c7649227e..b1eba9d479c49337d5835c665dd61b57a13582ba 100644 (file)
--- a/lemmy/staging/default.nix
+++ b/lemmy/staging/default.nix
@@ -41,7 +41,7 @@
       #   smtp_login = config.sops.placeholder."lemmy-staging/smtp_login";
       #   smtp_password = config.sops.placeholder."lemmy-staging/smtp_password";
       #   smtp_from_address = config.sops.placeholder."lemmy-staging/smtp_from_address";
-      #   tls_type = "tls";
+      #   tls_type = "starttls";
       # };
     });
 

diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index 530e9e2f8313c09c66b2c31a38f93b7c00395e45..3ed65ec319278dadc0eafb7cc8078d66515093a9 100644 (file)
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -2,19 +2,19 @@ lemmy:
     initial_admin_password: ENC[AES256_GCM,data:fPDeGjYK1PK7dEp5JFbH2Q==,iv:PPol1OK6s54WGg4gmO9ss/u9+QM6YcIKTug7/8V442Y=,tag:R9Wv+9gGocgmFYwDUfPUlQ==,type:str]
     smtp_server: ENC[AES256_GCM,data:4l7tfiwGfVCFnXQCEG6Gdhatnh2v,iv:uAZjGfoD7Ka4zjBafr0ktprvU/aexd4u1Rby4ls5kO4=,tag:2FYHnj+mTy+6gOWpMkz56w==,type:str]
     smtp_login: ENC[AES256_GCM,data:ud57LkAv,iv:leOnFXK8Lm5W33UcrgAEMyb+baMcVMu687s7ih1Zp/g=,tag:7llUqPlMHEQuzsa+kNqaoA==,type:str]
-    smtp_password: ENC[AES256_GCM,data:vrqLNdNO0v3gSGF9A/I8rJ7JhgRpQXHulnJlFj0OTNDBWt+Mi7g1r8n2XDvf8YFPh6N15i98QvzHZ0lWo3PCRoYqbOz9,iv:3+/S6OzsdsNivGNEpsm74rmq5pp4n1RcwC0dNuhALcM=,tag:Oao44DUS4I8TjeQuyKzDmw==,type:str]
+    smtp_password: ENC[AES256_GCM,data:pApzIK1fGOAAb2xuy0XtJA9lKxz7w7MZ2FklP2IrDfMxvwXlrAsjhuImpVddvoeDX7RPMFujDqWqwno19ZH0GKnij61s,iv:/M5KjZ+HLToZVd8YM0MlEQ1SqCpMDXv2ij4OR81C/9g=,tag:4QUsRMe1WsJKL+d1kI+2nA==,type:str]
     smtp_from_address: ENC[AES256_GCM,data:kpzULJxgqLbO5W6aDOao9OI=,iv:uCKQHZKFmStYmY4M4h1PnBwT1lHXiZeXXEYHPrbxEl8=,tag:ioMYOYuUYfxvX/K21KlzLw==,type:str]
 lemmy-staging:
     initial_admin_password: ENC[AES256_GCM,data:lAI52w5iEj+200bM+WNLdw==,iv:t4vMoyAzrUt5KnL5uT3loEz5zNcx+608A8/09DAFgTk=,tag:ZSLMdPRTUeX4xnYpwXpGvQ==,type:str]
     smtp_server: ENC[AES256_GCM,data:CJZz4rxPgnwRyXVXY+aBP/c16Hag,iv:2D05+ZmLlbrhxaCFAZSwkR2itZOpPzfaPdvUJeQClZg=,tag:WHfZIf+1B8b15mtlTxgXgg==,type:str]
     smtp_login: ENC[AES256_GCM,data:c05hsXpk,iv:S6m/BmUedMZvExTFdvkK41MhKcdOpXIFFsy8JRzDBpA=,tag:ISzUbU9V7iKC8rRrQjaqkQ==,type:str]
-    smtp_password: ENC[AES256_GCM,data:7uLqIkz9Hs/qFl20Mu6nvRgYNfzwN1fVf5jrgKCNVc2tCkek0LoMuFMoqSDohPRaLd459PNIoA+VrEwoVr9t23zpFJfe,iv:+OKiouo6YSsSRhN5GNrRhkJ48pw2fcHxUVhCtXj+vBw=,tag:sWiLDDfNfEOVNmMlRyeAvQ==,type:str]
+    smtp_password: ENC[AES256_GCM,data:C/arqpXb3hwLzZ0BM/lXHIv9J/Yucx4G6OF6gSvhhbCAALcQSAqhh+VKMZ0oVblkXNMua7tPjbrNpMrhXECmiTWCKEXx,iv:E23uVUAUDZc10dLvWlO1bwdsyqLkXDKYhHV/fXkcSds=,tag:VWCj/ibaoJKu2rUAUgrW8g==,type:str]
     smtp_from_address: ENC[AES256_GCM,data:DczTYEKW5PMhax/lp7Zmj6o=,iv:prcUFdyCst7DnCNqbM9cE+g3pap0KEHdyMrS/2CsxE0=,tag:X2e7IjkXbiQUxUEw/Cty8w==,type:str]
 lemmy-dev:
     initial_admin_password: ENC[AES256_GCM,data:7cQbzsfOn9l/6RI/2o6sWA==,iv:hdOWBMmt7WxD9vIUZ/V9PbEkGXCmj0NDVBwWIqjTmd4=,tag:iAgEJQO+mXSHN6MB8iwc0Q==,type:str]
     smtp_server: ENC[AES256_GCM,data:Ldk72toeDAZGkyZhyr2PlNg3HM/e,iv:e+mCtSWi0qI5XGaI1RABQWeJMGmUucWqHDZdsK42O90=,tag:6ChHbPw2bNehtlXSmEnMkA==,type:str]
     smtp_login: ENC[AES256_GCM,data:qwwuoUn2,iv:i+UQJZ30e7tLsV7755TYlAeGmB453t3F4rL4FgJaoio=,tag:54ZO7qMpbjuNT45HF7vaIQ==,type:str]
-    smtp_password: ENC[AES256_GCM,data:gx9P8gv3RuH7RkdapuqZ8z+y4nkwKOXJ9dYRRn+TEh/jQ2Zl3yWWJ1HKxrNJlzdidPtTEph7Z7YrQn5PzlNEfdBsMsXy,iv:4Aaa/2/X6NWPkX9UvN5FhyynbF4ADWG3+FTHXJCRlkY=,tag:RbVXS2lQNIiIseE7TTcmtg==,type:str]
+    smtp_password: ENC[AES256_GCM,data:eZw8Q4ml8Zm/eJjkFc2lPu2aD2Kaij+lBQjLr64Mlyd4qDtjCozJuUsvWFzv0DID11w+oz2PrP0WwID3PeJ3bSrE44lm,iv:/36+2yftqu1RkXMqneepQpIBD509RWqwWVfB6fr6oy4=,tag:dm4td0eXfNemmStAsLex4Q==,type:str]
     smtp_from_address: ENC[AES256_GCM,data:55Ljo/B0JJBOBuUvFoFXino=,iv:WXQz60z/nROYtrYX8qXKK8o1Q/LISb2Ewj9ac8+Btzw=,tag:KZBPNJVtI8SRX84aQDeWgg==,type:str]
 sops:
     kms: []
@@ -49,8 +49,8 @@ sops:
             RW13UEl1NEtza2NnTXY4YnFOY1d1QmsKxs+hTpa+s1jaG8T1tPo7FUtkEQA0WZpj
             qjgrYGhFpg6dicovfkY6Ksyx4WXgw52GTMQZjyEo6FJObUvSF6TmGg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-07-02T22:27:37Z"
-    mac: ENC[AES256_GCM,data:QwRu83wzt8N0cIrxeA/7mtAbIDSXWwTKD6j794hT6yCkaWmTFDhX3S1+TAIQzJXVQTvJRlPZ1sW8XD/lQy3wTgW/nKVFtNovFCABGAKWen/o8j5gjLvxKMLNjSTm93JdhvLO+vDaJSszs/50O8z3pCIYZxxFlXhz2CMtK0DRPJ4=,iv:nq3hika6ACbl+QI96i7Z5G47iWs5laPUCLztga5aPbA=,tag:YNUDgHcXV4yaEJ2VqxvVPg==,type:str]
+    lastmodified: "2023-07-03T00:55:32Z"
+    mac: ENC[AES256_GCM,data:3pMfdDawfzSYQ0G0+mOcKq2yERpy9J+pia952OtyofskRjHGQX8b3HmLxftm80PKk0uqkXQ5qNMc9utGrx1WWuDF8mCITGGLB40kk8OgFIWWGZwB0rHUyHh9LTl6ERCWJF+8HmGG6e7S3OX0NDkZo4BIK/UJaOxEJvzALyrwo/s=,iv:rcPcxWsBL1R6eKspSXk+YsihgkDgTzZNmNZ4faY8FGs=,tag:LfbV8HIGFEiMgigD3nKwSg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.7.3