From 82349a77cdbe79e915b459e1d075ad3c4d7b995d Mon Sep 17 00:00:00 2001 From: teutat3s Date: Mon, 27 May 2024 17:51:32 +0200 Subject: [PATCH] mail(treewide): update mail.greenbaum.zone -> mail.pub.solar --- modules/forgejo/default.nix | 2 +- modules/grafana/default.nix | 2 +- modules/mastodon/default.nix | 2 +- modules/nextcloud/default.nix | 2 +- modules/prometheus/default.nix | 2 +- secrets/matrix-synapse-secret-config.yaml.age | Bin 4191 -> 4186 bytes 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/forgejo/default.nix b/modules/forgejo/default.nix index 5c6d44b..26f7979 100644 --- a/modules/forgejo/default.nix +++ b/modules/forgejo/default.nix @@ -94,7 +94,7 @@ mailer = { ENABLED = true; PROTOCOL = "smtps"; - SMTP_ADDR = "mail.greenbaum.zone"; + SMTP_ADDR = "mail.pub.solar"; SMTP_PORT = 465; FROM = ''"pub.solar git server" ''; USER = "admins@pub.solar"; diff --git a/modules/grafana/default.nix b/modules/grafana/default.nix index 1080a1d..b62789e 100644 --- a/modules/grafana/default.nix +++ b/modules/grafana/default.nix @@ -59,7 +59,7 @@ }; smtp = { enabled = true; - host = "mail.greenbaum.zone:465"; + host = "mail.pub.solar:465"; user = "admins@pub.solar"; password = "\$__file{${config.age.secrets.grafana-smtp-password.path}}"; from_address = "no-reply@pub.solar"; diff --git a/modules/mastodon/default.nix b/modules/mastodon/default.nix index 3a12353..85210e0 100644 --- a/modules/mastodon/default.nix +++ b/modules/mastodon/default.nix @@ -60,7 +60,7 @@ vapidPublicKeyFile = "/run/agenix/mastodon-vapid-public-key"; smtp = { createLocally = false; - host = "mail.greenbaum.zone"; + host = "mail.pub.solar"; port = 587; authenticate = true; user = "admins@pub.solar"; diff --git a/modules/nextcloud/default.nix b/modules/nextcloud/default.nix index 00101c4..22003c8 100644 --- a/modules/nextcloud/default.nix +++ b/modules/nextcloud/default.nix @@ -63,7 +63,7 @@ mail_smtpname = "admins@pub.solar"; mail_smtpsecure = "tls"; mail_smtpauth = 1; - mail_smtphost = "mail.greenbaum.zone"; + mail_smtphost = "mail.pub.solar"; mail_smtpport = "587"; # This is to allow connections to collabora and keycloak, among other services diff --git a/modules/prometheus/default.nix b/modules/prometheus/default.nix index f77081a..b8ce54f 100644 --- a/modules/prometheus/default.nix +++ b/modules/prometheus/default.nix @@ -129,7 +129,7 @@ send_resolved = true; to = "admins@pub.solar"; from = "alerts@pub.solar"; - smarthost = "mail.greenbaum.zone:465"; + smarthost = "mail.pub.solar:465"; auth_username = "admins@pub.solar"; auth_password = "$SMTP_AUTH_PASSWORD"; require_tls = false; diff --git a/secrets/matrix-synapse-secret-config.yaml.age b/secrets/matrix-synapse-secret-config.yaml.age index dc28ea83cd49c25af4ca10bbf951d05aeeeaffad..84f1952c7ec61456edca0b000fb35881399a2bc8 100644 GIT binary patch literal 4186 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 do${vd&