diff --git a/.agenix_config.nix b/.agenix_config.nix index 00829be..70914c7 100644 Binary files a/.agenix_config.nix and b/.agenix_config.nix differ diff --git a/machines/magenta/services/gitea.nix b/machines/magenta/services/gitea.nix index 40ca9d6..2e0b76d 100644 --- a/machines/magenta/services/gitea.nix +++ b/machines/magenta/services/gitea.nix @@ -19,7 +19,7 @@ in domain = hostname; rootUrl = "https://${hostname}"; appName = "Pleshevskiy Git Repositories"; - mailerPasswordFile = config.age.secrets.gitea-mailserver-passfile.path; + mailerPasswordFile = config.age.secrets.gitea-smtp-passfile.path; database = { type = "postgres"; host = "/run/postgresql"; @@ -88,9 +88,10 @@ in mailer = { ENABLED = true; MAILER_TYPE = "smtp"; - FROM = "\"${giteaCfg.appName}\" "; - USER = "dmitriy@pleshevski.ru"; - HOST = "mail.pleshevski.ru:465"; + SMTP_ADDR = "mail.pleshevski.ru"; + SMTP_PORT = 465; + USER = "gitea@pleshevski.ru"; + FROM = "\"${giteaCfg.appName}\" "; }; openid = { ENABLE_OPENID_SIGNIN = true; @@ -109,8 +110,8 @@ in locations."/".proxyPass = "http://localhost:${toString giteaCfg.httpPort}/"; }; - age.secrets.gitea-mailserver-passfile = { - file = ../../../secrets/mailserver-users-jan-passfile.age; + age.secrets.gitea-smtp-passfile = { + file = ../../../secrets/gitea-smtp-passfile.age; owner = giteaCfg.user; group = "gitea"; }; diff --git a/machines/magenta/services/mailserver-accounts.secret.nix b/machines/magenta/services/mailserver-accounts.secret.nix index f6190fc..ccc70ba 100644 Binary files a/machines/magenta/services/mailserver-accounts.secret.nix and b/machines/magenta/services/mailserver-accounts.secret.nix differ diff --git a/secrets/gitea-smtp-passfile.age b/secrets/gitea-smtp-passfile.age new file mode 100644 index 0000000..8978c61 Binary files /dev/null and b/secrets/gitea-smtp-passfile.age differ diff --git a/secrets/mailserver-users-gitea-passfile.age b/secrets/mailserver-users-gitea-passfile.age new file mode 100644 index 0000000..e66130a Binary files /dev/null and b/secrets/mailserver-users-gitea-passfile.age differ