Update to nixfox for primary mail domain
This commit is contained in:
parent
c6526ac635
commit
b404b62564
9 changed files with 20 additions and 27 deletions
|
@ -19,8 +19,8 @@
|
|||
trusted_proxies = [ "127.0.0.1" ];
|
||||
trusted_domains = [ "cloud.${config.domains.p2}" ];
|
||||
overwriteprotocol = "https";
|
||||
mail_smtphost = "mx.${config.domains.p1}";
|
||||
mail_domain = "${config.domains.p1}";
|
||||
mail_smtphost = "mx.${config.domains.p2}";
|
||||
mail_domain = "${config.domains.p2}";
|
||||
mail_from_address = "noreply";
|
||||
mail_smtpauth = "true";
|
||||
mail_smtpname = "noreply@${config.domains.p2}";
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
};
|
||||
mailer = {
|
||||
ENABLED = true;
|
||||
SMTP_ADDR = "mx.${config.domains.p1}";
|
||||
SMTP_ADDR = "mx.${config.domains.p2}";
|
||||
FROM = "NixFox Git <noreply@${config.domains.p2}>";
|
||||
USER = "noreply@${config.domains.p2}";
|
||||
PASSWD = config.secrets.noreplyPassword;
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
enable = config.system.mailserver.enable;
|
||||
hostName = "mail.${config.domains.p2}";
|
||||
extraConfig = ''
|
||||
$config['smtp_server'] = "tls://mx.${config.domains.p1}";
|
||||
$config['smtp_server'] = "tls://mx.${config.domains.p2}";
|
||||
$config['smtp_user'] = "%u";
|
||||
$config['smtp_pass'] = "%p";
|
||||
'';
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
"${config.domains.luna}"
|
||||
"${config.domains.corn}"
|
||||
];
|
||||
fqdn = "mx.${config.domains.p1}";
|
||||
fqdn = "mx.${config.domains.p2}";
|
||||
certificateScheme = "acme-nginx";
|
||||
localDnsResolver = false;
|
||||
redis.port = 1515;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ pkgs, config, lib, ... }:
|
||||
{
|
||||
services.nginx.virtualHosts."mx.${config.domains.p1}" = lib.mkIf config.mailserver.enable {
|
||||
services.nginx.virtualHosts."mx.${config.domains.p2}" = lib.mkIf config.mailserver.enable {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
configureNginx = true;
|
||||
smtp = {
|
||||
createLocally = false;
|
||||
host = "mx.${config.domains.p1}";
|
||||
host = "mx.${config.domains.p2}";
|
||||
port = 587;
|
||||
authenticate = true;
|
||||
fromAddress = "NixFox Mastodon <noreply@${config.domains.p2}>";
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
email = {
|
||||
notif_from = "NixFox Matrix <noreply@${config.domains.p2}>";
|
||||
smtp_host = "mx.${config.domains.p1}";
|
||||
smtp_host = "mx.${config.domains.p2}";
|
||||
smtp_user = "noreply@${config.domains.p2}";
|
||||
smtp_pass = config.secrets.noreplyPassword;
|
||||
enable_tls = true;
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
ROCKET_LOG = "critical";
|
||||
|
||||
# Smtp email
|
||||
SMTP_HOST = "mx.${config.domains.p1}";
|
||||
SMTP_HOST = "mx.${config.domains.p2}";
|
||||
SMTP_FROM = "noreply@${config.domains.p2}";
|
||||
SMTP_FROM_NAME = "Vaultwarden";
|
||||
SMTP_USERNAME = "noreply@${config.domains.p2}";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue