add sendmail (OpenSMTPD) and journalwatch

This commit is contained in:
Daniel Langbein 2023-09-18 15:32:43 +02:00
parent 1840fec59e
commit 4925d958d1
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
8 changed files with 245 additions and 0 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/.idea/ /.idea/
/secrets/
/result /result

View File

@ -1,3 +1,4 @@
# Import nixpkgs with niv. https://dataswamp.org/~solene/2022-01-12-nix-niv-shell.html#_Create_a_shell.nix_file
let let
sources = import ./nix/sources.nix; sources = import ./nix/sources.nix;
in in
@ -23,6 +24,20 @@ in
# Import the per-host configuration file. # Import the per-host configuration file.
imports = [ ./hosts/${name}/configuration.nix ]; imports = [ ./hosts/${name}/configuration.nix ];
deployment.keys.smtpd = {
# When non-null, contents of the specified file will be deployed to the specified key on the target machine.
# https://github.com/NixOS/nixops/blob/fc9b55c55da62f949028143b974f67fdc7f40c8b/nix/keys.nix#L58
keyFile = ./secrets/smtpd;
destDir = "/secrets"; # Default: /run/keys
# smtpd user. https://github.com/NixOS/nixpkgs/blob/360a7d31c30abefdc490d203f80e3221b7a24af2/nixos/modules/services/mail/opensmtpd.nix#L93C7-L93C12
user = "smtpd"; # Default: root
#group = "smtpd"; # Default: root
permissions = "0400"; # Default: 0600
uploadAt = "pre-activation"; # Default: pre-activation, Alternative: post-activation
};
deployment = { deployment = {
# Local deployment. # Local deployment.
allowLocalDeployment = true; allowLocalDeployment = true;
@ -34,6 +49,20 @@ in
# Import the per-host configuration file. # Import the per-host configuration file.
imports = [ ./hosts/${name}/configuration.nix ]; imports = [ ./hosts/${name}/configuration.nix ];
deployment.keys.smtpd = {
# When non-null, contents of the specified file will be deployed to the specified key on the target machine.
# https://github.com/NixOS/nixops/blob/fc9b55c55da62f949028143b974f67fdc7f40c8b/nix/keys.nix#L58
keyFile = ./secrets/smtpd;
destDir = "/secrets"; # Default: /run/keys
# smtpd user. https://github.com/NixOS/nixpkgs/blob/360a7d31c30abefdc490d203f80e3221b7a24af2/nixos/modules/services/mail/opensmtpd.nix#L93C7-L93C12
user = "smtpd"; # Default: root
#group = "smtpd"; # Default: root
permissions = "0400"; # Default: 0600
uploadAt = "pre-activation"; # Default: pre-activation, Alternative: post-activation
};
deployment = { deployment = {
# Local deployment. # Local deployment.
allowLocalDeployment = true; allowLocalDeployment = true;
@ -49,6 +78,20 @@ in
# Import the per-host configuration file. # Import the per-host configuration file.
imports = [ ./hosts/${name}/configuration.nix ]; imports = [ ./hosts/${name}/configuration.nix ];
deployment.keys.smtpd = {
# When non-null, contents of the specified file will be deployed to the specified key on the target machine.
# https://github.com/NixOS/nixops/blob/fc9b55c55da62f949028143b974f67fdc7f40c8b/nix/keys.nix#L58
keyFile = ./secrets/smtpd;
destDir = "/secrets"; # Default: /run/keys
# smtpd user. https://github.com/NixOS/nixpkgs/blob/360a7d31c30abefdc490d203f80e3221b7a24af2/nixos/modules/services/mail/opensmtpd.nix#L93C7-L93C12
user = "smtpd"; # Default: root
#group = "smtpd"; # Default: root
permissions = "0400"; # Default: 0600
uploadAt = "pre-activation"; # Default: pre-activation, Alternative: post-activation
};
deployment = { deployment = {
# SSH deployment. # SSH deployment.
targetHost = "p1st.de"; targetHost = "p1st.de";

View File

@ -48,6 +48,8 @@ in
#../../modules/podman.nix #../../modules/podman.nix
#../../modules/docker.nix #../../modules/docker.nix
../../modules/lid-switch-handling.nix ../../modules/lid-switch-handling.nix
../../modules/sendmail-mta.nix
../../modules/journalwatch.nix
]; ];
networking.hostName = "yodaTab"; networking.hostName = "yodaTab";

View File

@ -48,6 +48,8 @@ in
#../../modules/podman.nix #../../modules/podman.nix
../../modules/docker.nix ../../modules/docker.nix
../../modules/lid-switch-handling.nix ../../modules/lid-switch-handling.nix
../../modules/sendmail-mta.nix
../../modules/journalwatch.nix
]; ];
networking.hostName = "yodaTux"; networking.hostName = "yodaTux";

View File

@ -50,6 +50,8 @@ in
#../../modules/podman.nix #../../modules/podman.nix
../../modules/docker.nix ../../modules/docker.nix
../../modules/lid-switch-handling.nix ../../modules/lid-switch-handling.nix
../../modules/sendmail-mta.nix
../../modules/journalwatch.nix
]; ];
networking.hostName = "yodaYoga"; networking.hostName = "yodaYoga";

105
modules/journalwatch.nix Normal file
View File

@ -0,0 +1,105 @@
{ config, pkgs, ... }:
{
# Write to Systemd Journal:
# echo 'hello' | systemd-cat -p emerg
# echo 'hello' | systemd-cat -t someapp -p emerg
# View Systemd Journal.
# Filter by app:
# journalctl -b -t someapp
# Filter by priority:
# journalctl -b -p 5
# Manually execute journalwatch timer:
# sudo systemctl start journalwatch.service
# Find a message and view its details
# journalctl -b -p5 -o json-pretty
# Then press "/" and enter a pattern, then press "Enter".
assertions = [{
assertion = config.services.opensmtpd.enable;
message = "journalwatch requires a configured sendmail MTA, see sendmail-mta.nix.";
}];
services.journalwatch = {
enable = true;
# TODO: Same as configured by sendmail MTA.
mailFrom = "langbein@mail.de";
mailTo = "daniel+journalwatch@systemli.org";
#interval = "hourly";
# Lowest priority of message to be considered. A value between 7 (“debug”), and 0 (“emerg”). Defaults to 6 (“info”). If you dont care about anything with “info” priority, you can reduce this to e.g. 5 (“notice”) to considerably reduce the amount of messages without needing many filterBlocks.
priority = 5;
# Default patterns: https://github.com/The-Compiler/journalwatch/blob/363725ac4b8aa841d87654fa8a63403a59ad1275/journalwatch.py#L71
# If the value of `match` starts and ends with a slash, it is interpreted as a regular expression, if not, it's an exact match.
# `filters` are always regular expressions.
# All regular expressions have to match the full string!
filterBlocks = [
{
filters = ''
.*
'';
match = "_SYSTEMD_UNIT = bluetooth.service";
}
{
filters = ''
.*
'';
match = "_SYSTEMD_UNIT = cups.service";
}
{ # If the user `yoda` runs a command with `sudo`.
filters = ''
\s+yoda : TTY=pts/7 ; PWD=/.+ ; USER=root ; COMMAND=/.+
'';
match = "SYSLOG_IDENTIFIER = sudo";
}
{
filters = ''
The system will suspend now!
'';
match = "_SYSTEMD_UNIT = systemd-logind.service";
}
{
filters = ''
Reexecuting.
finished switching to system configuration /nix/store/.+-nixos-system-.+-[0-9]+\.[0-9]+pre-git
'';
match = "_SYSTEMD_UNIT = user@0.service";
}
{
filters = ''
Reexecuting.
finished switching to system configuration /nix/store/.+-nixos-system-.+-[0-9]+\.[0-9]+pre-git
'';
match = "_SYSTEMD_UNIT = user@1000.service";
}
{
filters = ''
Reloading rules
Collecting garbage unconditionally...
Loading rules from directory /.+
Finished loading, compiling and executing [0-9]+ rules
'';
match = "_SYSTEMD_UNIT = polkit.service";
}
{ # yodaTux
filters = ''
.+ error name="org\.bluez\.MediaEndpoint1\.Error\.NotImplemented" .+
'';
match = "_SYSTEMD_USER_UNIT = dbus.service";
}
{ # yodaTux
filters = ''
ACPI: FW issue: working around C-state latencies out of order
# Kernel WiFi driver bug.
iwlwifi 0000:01:00.0: Unhandled alg: 0x707
'';
match = "SYSLOG_IDENTIFIER = kernel";
}
];
};
}

90
modules/sendmail-mta.nix Normal file
View File

@ -0,0 +1,90 @@
{ config, pkgs, ... }:
{
# Many programs use the `sendmail` command to send email.
# Nullmailer and OpenSMTP create a symlink from `sendmail` to their binary - they are (to a certain degree) sendmail compatible.
# In the following, we configure and use OpenSMTPD. Nullmailer is an alternative.
# Nullmailer: Send SMTP mail. Has a queue for storage of messages when offline.
# https://wiki.archlinux.org/title/Nullmailer
# OpenSMTPD
# - Manages a local persistent queue of messages that aren't allowed to be lost
# - Schedules delivery with some retry logic in case of temporary failures
# https://www.opensmtpd.org/presentations/eurobsdcon2017-smtpd/eurobsdcon2017-opensmtpd.pdf
# Verbose logging and deamon status
# sudo smtpctl log verbose
# systemctl status opensmtpd
# sudo smtpctl show status
# Send an email
# echo "Subject: hello" | sendmail -f langbein@mail.de daniel@systemli.org
# Queue handling
# sudo smtpctl show queue
# sudo smtpctl schedule all
# sudo smtpctl remove all
# Monitoring
# sudo smtpctl monitor
# /secrets/smtpd is created by Colmena.
# It contains one line `upstream langbein@mail.de:the-actual-password`.
assertions = [{
assertion = builtins.pathExists config.deployment.keys.smtpd.keyFile;
message = "Expected a keyfile to be deployed for smtpd, see hive.nix.";
}];
# Create file /etc/aliases.
# https://nixos.wiki/wiki/Msmtp#Aliases
environment.etc.aliases = {
text = ''
# Forward email from root to daniel@systemli.org
root: daniel@systemli.org
'';
mode = "0644";
};
services.opensmtpd = {
enable = true;
setSendmail = true;
# Config documentation
# https://man.archlinux.org/man/smtpd.conf.5
# Parts of the configuration were taken from exymple 1:
# This first example is similar to the default configuration (allows for mail from users and daemons on the local machine, as well as permitting email to remote servers), but all outgoing mail is forwarded to a remote SMTP server.
# https://man.archlinux.org/man/smtpd.conf.5#EXAMPLES
# Another config example
# https://xw.is/wiki/OpenSMTPD_forward_to_Google#How
serverConfiguration = ''
# System alias table.
# Provides a convenient way to send mail.
table aliases file:/etc/aliases
table secrets file:/secrets/smtpd
# Only accept local mail
# -> In the example, they use lo0
# -> In the default config of Arch Linux, they use localhost
# -> NixOS example config uses lo. https://search.nixos.org/options?channel=23.05&show=services.opensmtpd.serverConfiguration&from=0&size=50&sort=relevance&type=packages
# -> In the NUR, they use lo. https://github.com/nix-community/nur-combined/blob/2bfaab7c1ff891f540618370c2d184d0f000adb0/repos/priegger/modules/services/opensmtpd-relay/default.nix#L16C1-L16C17
# -> `ip addr` returns `lo` on NixOS.
listen on lo
#listen on lo0
#listen on localhost
# Send local mail.
#
# mbox: Deliver the message to the user's mbox with mail.local(8).
# With mail.local: Reads the standard input up to an end-of-file and appends it to each user's mail file.
# With mail files being stored in: /var/mail/user
# maildir: Deliver the message to the maildir in pathname if specified, or by default to ~/Maildir.
action "local_mail" mbox alias <aliases>
#action "local_mail" maildir alias <aliases>
# Send remote mail.
#action "outbound" relay host smtp+tls://upstream@smtp.mail.de auth <secrets> mail-from langbein@mail.de
action "outbound" relay host smtps://upstream@smtp.mail.de auth <secrets> mail-from langbein@mail.de
match from local for local action "local_mail"
match from local for any action "outbound"
'';
};
}

0
secrets/.gitkeep Normal file
View File