feat(ops/meta01): deploy irccat

This deploys irccat, connected to the #snix channel.

We drop the custom irccat third_party, it's 2 years older than the
latest version in nixpkgs.

The irccat.nix module file contains some of the code present in the TVL
version, it however moves the secrets merging to ExecStartPre=,
given https://github.com/systemd/systemd/issues/19604#issuecomment-989279884
has been fixed for almost a year.

Contrary to the setup there, we don't let irccat connect to ZNC, but
hackint directly (so make use of the secrets logic).

We also drop the network-online.target, and make this overall more
tolerant by using Restart=on-failure.

Change-Id: Ieac3b744b7ea58b8dddf1cdc37a8bc057b205b1b
Reviewed-on: https://cl.snix.dev/c/snix/+/30504
Autosubmit: Florian Klink <flokli@flokli.de>
Reviewed-by: Ryan Lahfa <ryan@lahfa.xyz>
Tested-by: besadii
This commit is contained in:
Florian Klink 2025-03-21 01:33:17 +00:00 committed by clbot
parent 5d16817f80
commit c9a77e5b58
5 changed files with 91 additions and 17 deletions

View file

@ -16,6 +16,7 @@ in
(mod "o11y/alertmanager-irc-relay.nix")
(mod "known-hosts.nix")
(mod "clbot.nix")
(mod "irccat.nix")
(mod "www/mimir.snix.dev.nix")
(mod "www/loki.snix.dev.nix")
@ -79,6 +80,23 @@ in
};
};
services.irccat = {
enable = true;
config = {
generic.listen = "127.0.0.1:4722";
irc = {
server = "irc.eu.hackint.org:6697";
tls = true;
sasl_pass = "filled_in_by_secret";
nick = "snixbot";
channels = [
"#snix"
];
};
};
secretsFile = config.age.secrets.irccat-secrets.path;
};
networking.nftables.enable = true;
networking.firewall.extraInputRules = ''
# Prometheus, Loki, Tempo
@ -99,6 +117,7 @@ in
metrics-push-htpasswd.owner = "nginx";
mimir-webhook-url.file = secretFile "mimir-webhook-url";
alertmanager-irc-relay-environment.file = secretFile "alertmanager-irc-relay-environment";
irccat-secrets.file = secretFile "irccat-secrets";
restic-repository-password.file = secretFile "restic-repository-password";
restic-bucket-credentials.file = secretFile "restic-bucket-credentials";
};

60
ops/modules/irccat.nix Normal file
View file

@ -0,0 +1,60 @@
{ config, lib, pkgs, ... }:
let
cfg = config.services.irccat;
description = "irccat - forward messages to IRC";
# irccat expects to read its configuration from the *current
# directory*, and its configuration contains secrets.
#
# To make this work we construct the JSON configuration file and
# then recursively merge it with an on-disk secret using jq on
# service launch.
configJson = pkgs.writeText "irccat.json" (builtins.toJSON cfg.config);
in
{
options.services.irccat = {
enable = lib.mkEnableOption description;
config = lib.mkOption {
type = lib.types.attrsOf lib.types.anything; # varying value types
description = "Configuration structure (unchecked!)";
};
secretsFile = lib.mkOption {
type = lib.types.str;
description = "Path to the secrets file to be merged";
};
};
config = lib.mkIf cfg.enable {
systemd.services.irccat = {
inherit description;
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
wants = [ "network.target" ];
serviceConfig = {
ExecStartPre = (pkgs.writeShellScript "merge-irccat-config" ''
if [ ! -f "$CREDENTIALS_DIRECTORY/secrets" ]; then
echo "irccat secrets file is missing"
exit 1
fi
# jq's * is the recursive merge operator
${pkgs.jq}/bin/jq -s '.[0] * .[1]' ${configJson} "$CREDENTIALS_DIRECTORY/secrets" \
> /var/lib/irccat/irccat.json
'');
ExecStart = "${pkgs.irccat}/bin/irccat";
DynamicUser = true;
StateDirectory = "irccat";
WorkingDirectory = "/var/lib/irccat";
LoadCredential = "secrets:${cfg.secretsFile}";
Restart = "on-failure";
RestartSec = "5s";
};
};
};
}

View file

@ -0,0 +1,11 @@
age-encryption.org/v1
-> ssh-ed25519 +qVung 3O7R2kPSWKYtSj2UtPdLihY0DTkoy0Cdjmk/mp2YTgA
Z3ySYVXGzKy7EbIl1KKjPvcWE+Gr+YrDxQjSWhtjnOQ
-> X25519 Z0zakQU8dXGTFghkdRFOBJ/lHZenShAxNyM+Vf8ccjs
kggGzVfLrdfS21RTQPMQESf7h0UNGpHwLj0MhLf11qw
-> ssh-ed25519 C2zWnA Byg3pvqGgZWgmbpnhsziFDzndMM6p0pd/Emsw+1NoTI
PCPzVeD8iImOAJ/bP6x/LYKQA9iWT42efWWAZsGl7xg
-> ssh-ed25519 LzO4tw yIkoQYky8Er+lodlBUUE0BYd4VfMdGKIHlVIaXTQPio
XlS7JQp+yZP0qgZV0e1YIjF4KcQ/LZE5Za6CAB/gZOo
--- mDqJdL1X9lyrrsjW0nYRbW13UN+xPDzW8j1rMp7PDBg
`¼¿5‡s<08>r‡?êÒs>İ$ßç¦e³Ê ¨weX˜5j_ÏÆñLR]RјWÑž*ô?ÇË{³‡À«B#O^æe×Q…fĨbÅiäÖ"~yÞèéÑ

View file

@ -47,7 +47,6 @@ in
"grafana-oauth-secret.age" = public01Default;
"binary-cache-key.age" = build01Default;
"buildkite-agent-token.age" = build01Default;
"buildkite-ssh-private-key.age" = build01Default;
@ -56,6 +55,7 @@ in
"metrics-push-htpasswd.age" = meta01Default;
"alertmanager-irc-relay-environment.age" = meta01Default;
"irccat-secrets.age" = meta01Default;
"mimir-environment.age" = meta01Default;
"mimir-webhook-url.age" = meta01Default;

View file

@ -1,16 +0,0 @@
# https://github.com/irccloud/irccat
{ lib, pkgs, ... }:
pkgs.buildGoModule rec {
pname = "irccat";
version = "20201108";
meta.license = lib.licenses.gpl3;
vendorHash = "sha256:06a985y4alw1rsghgmhfyczns6klz7bbkfn5mnqc9fdfclgg4s3r";
src = pkgs.fetchFromGitHub {
owner = "irccloud";
repo = "irccat";
rev = "17451e7e267f099e9614ec945541b624520f607e";
sha256 = "0l99mycxymyslwi8mmyfdcqa8pdp79wcyb04s5j5y4grmlsxw1wx";
};
}