Secrets changed, ssh key, add new noreply email

This commit is contained in:
Vice 2025-03-05 05:44:01 -05:00
parent 04857582cf
commit 8f66c8bf92
14 changed files with 26 additions and 24 deletions

View file

@ -6,7 +6,7 @@
networking = {
firewall.trustedInterfaces = [ "wgc" ];
wg-quick.interfaces.wgc = {
privateKey = config.secrets.wgClientPriv;
privateKey = config.secrets.wg.clientKey;
peers = [
{ # Kitty server
publicKey = "qnOT/lXOJMaQgDUdXpyfGZB2IEyUouRje2m/bCe9ux8=";

View file

@ -14,7 +14,7 @@
wireguard.interfaces.wgs = {
ips = [ "10.100.0.1/24" ];
listenPort = 51820;
privateKey = config.secrets.wgServerPriv;
privateKey = config.secrets.wg.serverKey;
peers = [
{ # NixOS Config Key
publicKey = "OKUH/h6YSURI4vgeTZKQD15QsqaygdbTn1mAWzQp9S0=";

Binary file not shown.

View file

@ -24,7 +24,7 @@
mail_from_address = "noreply";
mail_smtpauth = "true";
mail_smtpname = "noreply@nixfox.ca";
mail_smtppassword = config.secrets.noreplyPassword;
mail_smtppassword = config.secrets.mailPass.nixfoxNoReply;
mail_smtpmode = "smtp";
mail_smtpport = 587;
};

View file

@ -19,7 +19,7 @@
SMTP_ADDR = "mx.nixfox.ca";
FROM = "NixFox Git <noreply@nixfox.ca>";
USER = "noreply@nixfox.ca";
PASSWD = config.secrets.noreplyPassword;
PASSWD = config.secrets.mailPass.nixfoxNoReply;
PROTOCOL = "smtps";
};
service = {

View file

@ -11,11 +11,11 @@
hostname = "radio.nixfox.ca";
admin = {
user = "${config.sysusers.main}";
password = "${config.secrets.castAdminPass}";
password = "${config.secrets.cast.adminPass}";
};
extraConf = ''
<authentication>
<source-password>${config.secrets.castSourcePass}</source-password>
<source-password>${config.secrets.cast.sourcePass}</source-password>
</authentication>
<location>Canada</location>

View file

@ -14,7 +14,7 @@
%ffmpeg(format="ogg", %audio(codec="libvorbis", samplerate=48000, b="256k", channels=2)),
host="127.0.0.1",
port=${toString config.services.icecast.listen.port},
password="${config.secrets.castSourcePass}",
password="${config.secrets.cast.sourcePass}",
encoding = "UTF-8",
name="NixBops Radio",

View file

@ -14,7 +14,7 @@
%ffmpeg(format="ogg", %audio(codec="libvorbis", samplerate=48000, b="256k", channels=2)),
host="127.0.0.1",
port=${toString config.services.icecast.listen.port},
password="${config.secrets.castSourcePass}",
password="${config.secrets.cast.sourcePass}",
encoding = "UTF-8",
name="Nixbops Scrap",

View file

@ -21,13 +21,8 @@
# Passwords made with 'mkpasswd -sm bcrypt'
loginAccounts = {
"noreply@nixfox.ca" = {
hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash;
sendOnly = true;
};
"jimbo@nixfox.ca" = {
hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash;
hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.mailHash.jimbo;
aliases = [
"james@nixfox.ca"
"jimbo@bloxelcom.net"
@ -41,7 +36,7 @@
};
"luna@lunamoonlight.xyz" = {
hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
hashedPasswordFile = pkgs.writeText "luna" config.secrets.mailHash.luna;
aliases = [
"luna@bloxelcom.net"
"contact@bloxelcom.net"
@ -50,9 +45,19 @@
};
"contact@freecorn1854.win" = {
hashedPasswordFile = pkgs.writeText "corn" config.secrets.cornMailHash;
hashedPasswordFile = pkgs.writeText "corn" config.secrets.mailHash.corn;
aliases = [ "freecorn@bloxelcom.net" ];
};
# Noreply emails
"noreply@nixfox.ca" = {
hashedPasswordFile = pkgs.writeText "noreply" config.secrets.mailHash.nixfoxNoReply;
sendOnly = true;
};
"noreply@bloxelcom.net" = {
hashedPasswordFile = pkgs.writeText "noreply" config.secrets.mailHash.bloxelNoReply;
sendOnly = true;
};
};
};

View file

@ -13,7 +13,7 @@
authenticate = true;
fromAddress = "NixFox Mastodon <noreply@nixfox.ca>";
user = "noreply@nixfox.ca";
passwordFile = pkgs.writeText "smtp_pass.txt" config.secrets.noreplyPassword;
passwordFile = pkgs.writeText "smtp_pass.txt" config.secrets.mailPass.nixfoxNoReply;
};
};
environment.persistence."/persist".directories = [ "/var/lib/mastodon" ];

View file

@ -15,7 +15,7 @@
notif_from = "NixFox Matrix <noreply@nixfox.ca>";
smtp_host = "mx.nixfox.ca";
smtp_user = "noreply@nixfox.ca";
smtp_pass = config.secrets.noreplyPassword;
smtp_pass = config.secrets.mailPass.nixfoxNoReply;
enable_tls = true;
smtp_port = 587;
require_transport_security = true;

View file

@ -17,7 +17,7 @@
SMTP_FROM = "noreply@nixfox.ca";
SMTP_FROM_NAME = "Vaultwarden";
SMTP_USERNAME = "noreply@nixfox.ca";
SMTP_PASSWORD = config.secrets.noreplyPassword;
SMTP_PASSWORD = config.secrets.mailPass.nixfoxNoReply;
SMTP_SECURITY = "starttls";
SMTP_PORT = 587;
SMTP_TIMEOUT = 15;