diff --git a/forgejo.nix b/forgejo.nix index 8cc2880..6cb7c07 100644 --- a/forgejo.nix +++ b/forgejo.nix @@ -1,6 +1,5 @@ { domainName, - config, ... }: { @@ -17,16 +16,7 @@ }; session.COOKIE_SECURE = true; service.DISABLE_REGISTRATION = true; - mailer = { - ENABLED = true; - SMTP_ADDR = "in-v3.mailjet.com"; - SMTP_PORT = 587; - FROM = "noreply@forgejo.${domainName}"; - # USER and PASSWD come from secrets below - }; }; - secrets.mailer.USER = config.sops.secrets."forgejo-mailer-user".path; - secrets.mailer.PASSWD = config.sops.secrets."forgejo-mailer-passwd".path; }; nginx.virtualHosts."git.${domainName}" = { forceSSL = true; @@ -47,12 +37,4 @@ }; }; }; - sops.secrets."forgejo-mailer-user" = { - sopsFile = ./secrets/forgejo.yaml; - mode = "0400"; - }; - sops.secrets."forgejo-mailer-passwd" = { - sopsFile = ./secrets/forgejo.yaml; - mode = "0400"; - }; } diff --git a/secrets/forgejo.yaml b/secrets/forgejo.yaml deleted file mode 100644 index c900964..0000000 --- a/secrets/forgejo.yaml +++ /dev/null @@ -1,17 +0,0 @@ -forgejo-mailer-user: ENC[AES256_GCM,data:M++19F8ZcQlcqa4qq00a5SZK7VhIFbLLEETEqdKkaKo=,iv:iADeb3SedAj3U/k3ch2se733bsxOoynmylTMyMd6y3A=,tag:MsB4ysgt2iVmLL0K8v0DwA==,type:str] -forgejo-mailer-passwd: ENC[AES256_GCM,data:YkYrJiBpyjcevgYnMoturP5PKO9pF9gZVTWW7WIIgmI=,iv:vZYh+L85ofoN+6wW6aUbsKplJzm/WmL2pQ8n1kIYRL8=,tag:K/Qi/APK5A1zUDYkqWu/Rg==,type:str] -sops: - age: - - recipient: age1haj8v88kjna6ttkdufjpyjcf478kyvclnpdc8jwh97ewhqcc9eqsgrku4v - enc: | - -----BEGIN AGE ENCRYPTED FILE----- - YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPQnJsTko5RzVyUzMyQWpW - K2kxSTZRRFZDMmNWanBIdFFRY3dUNGxUcVVVCmYzT29KTE8zTmx5dW1samNjUHo1 - cjdRRjVwWXZWMjM0UEp6amRqaEtIdjgKLS0tIG9Oem04U01aTFUrM2ttT05ib0k5 - dnJFdXVoWG5vVUtGbkJsWU1XSmpGbGMKpXBag+onGcz55xAEDN1vq4pe4qx6MDYF - O9YxT8/EyYqermncHKlkG5ASMyeH/zMWtfJN0dUYkFVCVmi0eEWM8Q== - -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-05-14T07:02:00Z" - mac: ENC[AES256_GCM,data:njXcE/sgv1tRn8YGied5kMVm8s8FG/wZwsFSlesr53MKUn86+GglctLBAzNMcYEkkZ7P8rdNhSSzTc1eHw88YDZrzskrShLJMOlWoiE952MX8Xlmxeb34GybNWSDqKauzzUwJTGRhf4Cpefy9jpb1De1KJUNJ/R8M4MjS+LyUVI=,iv:hT13jCfxWnTRm4xErd4Sv53MqQvwnrZvkfvCYmCqijU=,tag:RKYAdKkojccDhxkicjozkQ==,type:str] - unencrypted_suffix: _unencrypted - version: 3.12.2