From 22dea9ec7d9330e1089cfe2b6ac4bf6bf9d759ff Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Wed, 7 Feb 2024 10:19:13 +0100 Subject: [PATCH] feat(forgejo): Setup mail --- machines/storage01/forgejo.nix | 8 ++++-- .../secrets/forgejo-database_password_file | 27 ------------------- .../secrets/forgejo-mailer_password_file | 24 +++++++++++++++++ machines/storage01/secrets/secrets.nix | 2 +- 4 files changed, 31 insertions(+), 30 deletions(-) delete mode 100644 machines/storage01/secrets/forgejo-database_password_file create mode 100644 machines/storage01/secrets/forgejo-mailer_password_file diff --git a/machines/storage01/forgejo.nix b/machines/storage01/forgejo.nix index 2de9e56..b9ac4ee 100644 --- a/machines/storage01/forgejo.nix +++ b/machines/storage01/forgejo.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ config, pkgs, ... }: let port = 3000; @@ -36,6 +36,8 @@ in EMAIL_DOMAIN_ALLOWLIST = "dgnum.eu,*"; DISABLE_REGISTRATION = false; + REGISTER_EMAIL_CONFIRM = true; + ENABLE_NOTIFY_MAIL = true; }; log.LEVEL = "Warn"; @@ -48,7 +50,7 @@ in }; mailer = { - ENABLED = false; + ENABLED = true; FROM = "git@infra.dgnum.eu"; MAILER_TYPE = "smtp"; SMTP_ADDR = "kurisu.lahfa.xyz"; @@ -57,6 +59,8 @@ in USER = "web-services@infra.dgnum.eu"; }; }; + + mailerPasswordFile = config.age.secrets."forgejo-mailer_password_file".path; }; nginx = { diff --git a/machines/storage01/secrets/forgejo-database_password_file b/machines/storage01/secrets/forgejo-database_password_file deleted file mode 100644 index 24d074d..0000000 --- a/machines/storage01/secrets/forgejo-database_password_file +++ /dev/null @@ -1,27 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 rHotTw /3o+tx+q7K/9Uzgq6tJDEnIi6+B4widrRWNXwE/Ar2Q -62uhJuFIzBdNQ1fhQQpg6zGbr6jYPpeaTYr/5vKfG5w --> ssh-ed25519 jIXfPA cr/LauK0lDer6sWDyuLIlLZ6vVAZOQiiMJppyN1VGCY -6GTU5yNu8OYcFuDUM86fbxb+SBgN3mfGCLR5fvyEu6M --> ssh-ed25519 QlRB9Q 9kLq7vwUMOV2tkZ1PZQdJMz7bTQdKbCKZUJAGnBv4U4 -1Zw0WUMIUf5SJEtvyH0UmCxoaCpCrKrh5mpolAKsito --> ssh-ed25519 r+nK/Q jgHCpA6njdjJBnx+XmKgZQOa5nY0t/WcCrw3zdOs0AU -Yk1cdPZyMfc2p6++kd0I05hQ3vWemCtVLtBpdxT9et8 --> ssh-rsa krWCLQ -AAq77XREUYnKs4N5OzwaMiTqrbg57XfWbYChRxIDl93nSSHCO+OzSHac9LZkEUzx -7/yD0lUzSmP9izW2jMKUgErUVhDEURc+e+oHJGulYmjnUb7Uq6r0CJqUJJOUz1I0 -MqLffZNzCDJg+4dEvnoGlYtIAHQAHxkWVRonLadjyT8M6CKvhn2sBptGJV+FzprJ -iiSW1cP1Ogs2Uw6SGQNdj0sPMrOUBr+Ads3mkqMo7o4F4X2lUGqTeQ19acVCvLoS -Ibkq+6+2MMD731bQ1/LHSfrXW2x7MIaj4VWZI/ZtGliASqel3vd/cGdQQUdypEsJ -4JZj8D9OwwLVeexnvSkXhw --> ssh-ed25519 /vwQcQ eJgbyVM7k9CozIBDiuakc5aRGIIIWw6cNmvgsVAAsHE -+rF4Fu0TenvNLj60FGmyDKNeFBSsUSHsk4gonYk5DcA --> ssh-ed25519 0R97PA AXBUUdrP3kMxq9s3L6A/6iLutV68wgqDNh/WwhlLKWs -5PTPn0O/npU81KtvNFejU6u17yk8neZm5lg/hGTybFA --> ssh-ed25519 JGx7Ng wzuo6kXtfltola6VjKZTf9Y3IWwBhZfprcoulluTnEs -b8zw3WW/b6QM/8UZmbL/MAE/QUm18053EOBMpG471qc --> 5!cP*-grease Ss`m + K]g z{F9?8 -9EiZB6aeE5UcJr4Q1CcNVu4rHnY ---- e6OaSbektjO17yPRqxAqfDjDoVF9QafMXCfOFqq0y5g -F?l|`L -4.0%"SZDCYlݭ'SU \ No newline at end of file diff --git a/machines/storage01/secrets/forgejo-mailer_password_file b/machines/storage01/secrets/forgejo-mailer_password_file new file mode 100644 index 0000000..27250f3 --- /dev/null +++ b/machines/storage01/secrets/forgejo-mailer_password_file @@ -0,0 +1,24 @@ +age-encryption.org/v1 +-> ssh-ed25519 rHotTw qQiJYgYb07sFhRjR6IpMvhdw8SoShzHBCn8AUsG/OQw +hL3PJl47hVtLbD/h1LKcbvkXKk7aGhAfaRSjyYxfL20 +-> ssh-ed25519 jIXfPA WAYUzqcf17MzIAPMpsPEHNGZcKmI/WZcIYCXB/pKeXQ +123G7ZTB+AKCjc8EGF+TCKDNr+ANpokAhpTeXYXzuVE +-> ssh-ed25519 QlRB9Q R7SAJ7OniaUPp3ppRRCsu9BHgWkJR3AWAAST4jho2DA +VHHdoR9ZgYxxlydQwgAvfmHg0cJO598Zs4IVCP7B16s +-> ssh-ed25519 r+nK/Q PY5cUV4FTZw5ZM4Fnq3hii1FfaOb/E+i99PdKviL1Bk +Vxhj87DotHG3L/iafihIRLhFl7BIELQNaBQgs2DXvaA +-> ssh-rsa krWCLQ +LK8OkVMChJ7DcXUhRBwzTU5NqoG8avsR2JumAUCfDU4+QN56Kw5qomDSayBCTrM8 +7nlFpvuqQ+gYgD4Ms5wwpUkw+YPQF+WiSalsDl3aXLpMHR8UyamP8+ty/vaxyssk +nvWe6jITOEgV+Y9Yp4a5xWEpoIoiR+28+nF0bmHYshu7Y6zjpwrmEcVLvFuIK/4D +qXrQzqKSvi4uRk+7ugAahEwf6VtuIh58YaYLklVrF6hglWwRyE/dxiDnp7eDQKB0 +mtqdwQC2x06eICpz31DTgBXz7F/BztSgUNsS3ejC1MzLpY9CXXzd7J3OrPcjTvjc +BtoDSsKekH4yPTOmUEB12g +-> ssh-ed25519 /vwQcQ JsheOMV6PUlIvSSQjaEn68BHA0PRbOhPJiVIvQes6QI +7lR/YTg56W0jW7QLDvVq1RhmkpZ92ibFT/H8dqlqZfk +-> ssh-ed25519 0R97PA kkX7r3iZ8KkzPcfC+CVRrYR0zubBfptMaGyhTg7q6kE +w75nfz7eOE+TZTLb5GBW3aSyRe2G7173u9LtfKcRj78 +-> ssh-ed25519 JGx7Ng 0Gm6MlkhcqCsQfGLvXhcqPUcmPaFlrDUHn7OlcgYqjI +9lkW+1w5kKAx625bXQY+hAZgXPteEUv9KAZJ607VQ8I +--- cSqPHjj0wSYIZmvbA3tEskrqhszf5ipj2zrVwz/wIIg +g%SzUU5%3ˢmc,6O|Hp`NV5Yt6L<+ \ No newline at end of file diff --git a/machines/storage01/secrets/secrets.nix b/machines/storage01/secrets/secrets.nix index 5201bf7..945d75f 100644 --- a/machines/storage01/secrets/secrets.nix +++ b/machines/storage01/secrets/secrets.nix @@ -4,7 +4,7 @@ let in lib.setDefault { inherit publicKeys; } [ "atticd-credentials_file" - "forgejo-database_password_file" + "forgejo-mailer_password_file" "forgejo_runners-token_file" "garage-environment_file" "netbird-auth_client_secret_file"