Shift the noreply email to nixfox
This commit is contained in:
parent
1bb7bb27bf
commit
ef2ee5fb07
|
@ -20,7 +20,7 @@
|
||||||
mail_domain = "${config.domains.p1}";
|
mail_domain = "${config.domains.p1}";
|
||||||
mail_from_address = "noreply";
|
mail_from_address = "noreply";
|
||||||
mail_smtpauth = "true";
|
mail_smtpauth = "true";
|
||||||
mail_smtpname = "noreply@${config.domains.p1}";
|
mail_smtpname = "noreply@${config.domains.p2}";
|
||||||
mail_smtppassword = config.secrets.noreplyPassword;
|
mail_smtppassword = config.secrets.noreplyPassword;
|
||||||
mail_smtpmode = "smtp";
|
mail_smtpmode = "smtp";
|
||||||
mail_smtpport = 587;
|
mail_smtpport = 587;
|
||||||
|
|
|
@ -16,8 +16,8 @@
|
||||||
mailer = {
|
mailer = {
|
||||||
ENABLED = true;
|
ENABLED = true;
|
||||||
SMTP_ADDR = "mx.${config.domains.p1}";
|
SMTP_ADDR = "mx.${config.domains.p1}";
|
||||||
FROM = "NixFox Git <noreply@${config.domains.p1}>";
|
FROM = "NixFox Git <noreply@${config.domains.p2}>";
|
||||||
USER = "noreply@${config.domains.p1}";
|
USER = "noreply@${config.domains.p2}";
|
||||||
PASSWD = config.secrets.noreplyPassword;
|
PASSWD = config.secrets.noreplyPassword;
|
||||||
PROTOCOL = "smtps";
|
PROTOCOL = "smtps";
|
||||||
};
|
};
|
||||||
|
|
|
@ -18,16 +18,9 @@
|
||||||
localDnsResolver = false;
|
localDnsResolver = false;
|
||||||
redis.port = 1515;
|
redis.port = 1515;
|
||||||
|
|
||||||
dmarcReporting = {
|
|
||||||
enable = true;
|
|
||||||
domain = "${config.domains.p1}";
|
|
||||||
localpart = "noreply";
|
|
||||||
organizationName = "Jimbo's Files";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Passwords made with 'mkpasswd -sm bcrypt'
|
# Passwords made with 'mkpasswd -sm bcrypt'
|
||||||
loginAccounts = {
|
loginAccounts = {
|
||||||
"noreply@${config.domains.p1}" = {
|
"noreply@${config.domains.p2}" = {
|
||||||
hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash;
|
hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash;
|
||||||
sendOnly = true;
|
sendOnly = true;
|
||||||
};
|
};
|
||||||
|
@ -38,12 +31,11 @@
|
||||||
"james@${config.domains.p1}"
|
"james@${config.domains.p1}"
|
||||||
"james@${config.domains.p2}"
|
"james@${config.domains.p2}"
|
||||||
|
|
||||||
"vicee@${config.domains.p2}"
|
"vicee@${config.domains.p2}"
|
||||||
"vice@${config.domains.p2}"
|
"vice@${config.domains.p2}"
|
||||||
"yara@${config.domains.p2}"
|
"yara@${config.domains.p2}"
|
||||||
"yaralis@${config.domains.p2}"
|
"yaralis@${config.domains.p2}"
|
||||||
|
|
||||||
"contact@${config.domains.p1}"
|
|
||||||
"contact@${config.domains.p2}"
|
"contact@${config.domains.p2}"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
live on;
|
live on;
|
||||||
allow play all;
|
allow play all;
|
||||||
hls on;
|
hls on;
|
||||||
hls_path /var/www/Jimbo-Landing-Page/streams/hls/;
|
hls_path /var/www/landing-page/streams/hls/;
|
||||||
hls_fragment_naming system;
|
hls_fragment_naming system;
|
||||||
hls_fragment 3;
|
hls_fragment 3;
|
||||||
hls_playlist_length 40;
|
hls_playlist_length 40;
|
||||||
|
|
|
@ -10,8 +10,8 @@
|
||||||
host = "mx.${config.domains.p1}";
|
host = "mx.${config.domains.p1}";
|
||||||
port = 587;
|
port = 587;
|
||||||
authenticate = true;
|
authenticate = true;
|
||||||
fromAddress = "Jimbo's Mastodon <noreply@${config.domains.p1}>";
|
fromAddress = "NixFox Mastodon <noreply@${config.domains.p2}>";
|
||||||
user = "noreply@${config.domains.p1}";
|
user = "noreply@${config.domains.p2}";
|
||||||
passwordFile = pkgs.writeText "smtp_pass.txt" config.secrets.noreplyPassword;
|
passwordFile = pkgs.writeText "smtp_pass.txt" config.secrets.noreplyPassword;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -29,9 +29,9 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
email = {
|
email = {
|
||||||
notif_from = "NixFox Matrix <noreply@${config.domains.p1}>";
|
notif_from = "NixFox Matrix <noreply@${config.domains.p2}>";
|
||||||
smtp_host = "mx.${config.domains.p1}";
|
smtp_host = "mx.${config.domains.p1}";
|
||||||
smtp_user = "noreply@${config.domains.p1}";
|
smtp_user = "noreply@${config.domains.p2}";
|
||||||
smtp_pass = config.secrets.noreplyPassword;
|
smtp_pass = config.secrets.noreplyPassword;
|
||||||
enable_tls = true;
|
enable_tls = true;
|
||||||
smtp_port = 587;
|
smtp_port = 587;
|
||||||
|
|
|
@ -13,9 +13,9 @@
|
||||||
|
|
||||||
# Smtp email
|
# Smtp email
|
||||||
SMTP_HOST = "mx.${config.domains.p1}";
|
SMTP_HOST = "mx.${config.domains.p1}";
|
||||||
SMTP_FROM = "noreply@${config.domains.p1}";
|
SMTP_FROM = "noreply@${config.domains.p2}";
|
||||||
SMTP_FROM_NAME = "Vaultwarden";
|
SMTP_FROM_NAME = "Vaultwarden";
|
||||||
SMTP_USERNAME = "noreply@${config.domains.p1}";
|
SMTP_USERNAME = "noreply@${config.domains.p2}";
|
||||||
SMTP_PASSWORD = config.secrets.noreplyPassword;
|
SMTP_PASSWORD = config.secrets.noreplyPassword;
|
||||||
SMTP_SECURITY = "starttls";
|
SMTP_SECURITY = "starttls";
|
||||||
SMTP_PORT = 587;
|
SMTP_PORT = 587;
|
||||||
|
|
Loading…
Reference in a new issue