diff options
| author | makefu <github@syntax-fehler.de> | 2022-08-02 14:34:22 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2022-08-02 14:34:22 +0200 |
| commit | 739fad41da87d206f76bc3db9861d8b2bd0a5639 (patch) | |
| tree | 023f294d5ba55b93905772eec90a3ebbe3667528 /krebs/2configs | |
| parent | bebf0baf031fca08fde11cc7f840fc885737f5b7 (diff) | |
| parent | b3694198eaac7ffd13640c64bc3e3af27e40389b (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs/2configs')
| -rw-r--r-- | krebs/2configs/exim-smarthost.nix | 10 | ||||
| -rw-r--r-- | krebs/2configs/reaktor2.nix | 4 |
2 files changed, 6 insertions, 8 deletions
diff --git a/krebs/2configs/exim-smarthost.nix b/krebs/2configs/exim-smarthost.nix index 224a38ac3..82f8ec942 100644 --- a/krebs/2configs/exim-smarthost.nix +++ b/krebs/2configs/exim-smarthost.nix @@ -22,13 +22,11 @@ in { tv ]; in { - "anmeldung@eloop.org" = eloop-ml; "brain@krebsco.de" = brain-ml; - "cfp2019@eloop.org" = eloop-ml; - "eloop2019@krebsco.de" = eloop-ml; - "kontakt@eloop.org" = eloop-ml; - "root@eloop.org" = eloop-ml; - "youtube@eloop.org" = eloop-ml; + "eloop2022@krebsco.de" = eloop-ml; + "root@eloop.org" = eloop-ml; # obsolete, use spam@eloop.org instead + "spam@eloop.org" = eloop-ml; + "youtube@eloop.org" = eloop-ml; # obsolete, use spam@eloop.org instead "postmaster@krebsco.de" = spam-ml; # RFC 822 "lass@krebsco.de" = lass; "makefu@krebsco.de" = makefu; diff --git a/krebs/2configs/reaktor2.nix b/krebs/2configs/reaktor2.nix index 205cc96f4..2ed0b08fb 100644 --- a/krebs/2configs/reaktor2.nix +++ b/krebs/2configs/reaktor2.nix @@ -71,12 +71,12 @@ let ${pkgs.hledger}/bin/hledger -f $state_file bal -N -O csv \ | ${pkgs.coreutils}/bin/tail +2 \ | ${pkgs.miller}/bin/mlr --icsv --opprint cat \ - | ${pkgs.gnused}/bin/sed 's/^/the_/' + | ${pkgs.gnused}/bin/sed 's/^\(.\)/\1/' ''; }; } { - pattern = ''^([\H-]*):?\s+([+-][1-9][0-9]*)\s+(\S+)$''; + pattern = ''^([\H-]*?):?\s+([+-][1-9][0-9]*)\s+(\S+)$''; activate = "match"; arguments = [1 2 3]; command = { |