fix: remove extra msmtp stanza
This commit is contained in:
@@ -94,7 +94,7 @@ let
|
|||||||
};
|
};
|
||||||
cachix.enable = false;
|
cachix.enable = false;
|
||||||
monitoring.nodeExporter.enable = false;
|
monitoring.nodeExporter.enable = false;
|
||||||
mft.enable = true; # Mellanox MFT
|
mft.enable = false; # Mellanox MFT
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
@@ -289,6 +289,18 @@ let
|
|||||||
permissions = "u+rs,g+rx,o+rx";
|
permissions = "u+rs,g+rx,o+rx";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Use nvd to get package diff before apply
|
||||||
|
system.activationScripts.system-diff = {
|
||||||
|
supportsDryActivation = true; # safe: only outputs to stdout
|
||||||
|
text = ''
|
||||||
|
export PATH="${pkgs.lib.makeBinPath [ pkgs.nixVersions.latest ]}:$PATH"
|
||||||
|
if [ -e /run/current-system ]; then
|
||||||
|
${pkgs.lib.getExe pkgs.nvd} diff '/run/current-system' "$systemConfig" || true
|
||||||
|
fi
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
openssh-shosts = pkgs.openssh.overrideAttrs (attrs: {
|
openssh-shosts = pkgs.openssh.overrideAttrs (attrs: {
|
||||||
|
|||||||
@@ -205,25 +205,6 @@ in {
|
|||||||
# secret-key-files = /etc/nix/ekman.key
|
# secret-key-files = /etc/nix/ekman.key
|
||||||
'';
|
'';
|
||||||
|
|
||||||
programs.msmtp = {
|
|
||||||
enable = true;
|
|
||||||
accounts = {
|
|
||||||
default = {
|
|
||||||
auth = false;
|
|
||||||
tls = false;
|
|
||||||
tls_starttls = false;
|
|
||||||
port = 24;
|
|
||||||
from = "rossby@oceanbox.io";
|
|
||||||
host = "smtpgw.itpartner.no";
|
|
||||||
# user = "utvikling";
|
|
||||||
# password = "S0m3rp0m@de#21!";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
defaults = {
|
|
||||||
aliases = "/etc/aliases";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.prometheus.alertmanager.configuration.global = {
|
services.prometheus.alertmanager.configuration.global = {
|
||||||
smtp_smarthost = "smtpgw.itpartner.no";
|
smtp_smarthost = "smtpgw.itpartner.no";
|
||||||
# smtp_auth_username = "utvikling";
|
# smtp_auth_username = "utvikling";
|
||||||
@@ -276,17 +257,6 @@ in {
|
|||||||
srv-host = "_slurmctld._tcp.cluster.local,slurmctld.cluster.local,6817,0,5";
|
srv-host = "_slurmctld._tcp.cluster.local,slurmctld.cluster.local,6817,0,5";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Use nvd to get package diff before apply
|
|
||||||
system.activationScripts.system-diff = {
|
|
||||||
supportsDryActivation = true; # safe: only outputs to stdout
|
|
||||||
text = ''
|
|
||||||
export PATH="${pkgs.lib.makeBinPath [ pkgs.nixVersions.latest ]}:$PATH"
|
|
||||||
if [ -e /run/current-system ]; then
|
|
||||||
${pkgs.lib.getExe pkgs.nvd} diff '/run/current-system' "$systemConfig" || true
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# ssh-rsa is deprecated, but putty/winscp users use it
|
# ssh-rsa is deprecated, but putty/winscp users use it
|
||||||
services.openssh.extraConfig = ''
|
services.openssh.extraConfig = ''
|
||||||
# pubkeyacceptedalgorithms ssh-rsa,ssh-ed25519-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp521-cert-v01@openssh.com,sk-ssh-ed25519-cert-v01@openssh.com,sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,sk-ssh-ed25519@openssh.com,sk-ecdsa-sha2-nistp256@openssh.com,rsa-sha2-512,rsa-sha2-256
|
# pubkeyacceptedalgorithms ssh-rsa,ssh-ed25519-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp521-cert-v01@openssh.com,sk-ssh-ed25519-cert-v01@openssh.com,sk-ecdsa-sha2-nistp256-cert-v01@openssh.com,rsa-sha2-512-cert-v01@openssh.com,rsa-sha2-256-cert-v01@openssh.com,ssh-ed25519,ecdsa-sha2-nistp256,ecdsa-sha2-nistp384,ecdsa-sha2-nistp521,sk-ssh-ed25519@openssh.com,sk-ecdsa-sha2-nistp256@openssh.com,rsa-sha2-512,rsa-sha2-256
|
||||||
|
|||||||
Reference in New Issue
Block a user