diff options
| author | lassulus <git@lassul.us> | 2024-10-14 19:43:50 +0200 |
|---|---|---|
| committer | lassulus <git@lassul.us> | 2024-10-14 19:43:50 +0200 |
| commit | 9af8bb1b1e29af42a4a3a992bbaff47109490762 (patch) | |
| tree | 4443e94b2d972929696094c1ed8119821c700072 | |
| parent | 2a9f90fb803b23f543fe9ec4c04f56e23bb512ca (diff) | |
| parent | 32e3b1071cfab6026795f44d38d496e6a7e8af8a (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | krebs/2configs/exim-smarthost.nix | 5 | ||||
| -rw-r--r-- | krebs/3modules/git.nix | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/krebs/2configs/exim-smarthost.nix b/krebs/2configs/exim-smarthost.nix index 6445783f0..ceb11ca64 100644 --- a/krebs/2configs/exim-smarthost.nix +++ b/krebs/2configs/exim-smarthost.nix @@ -16,7 +16,9 @@ in { makefu tv ]; - eloop-ml = spam-ml; + eloop-ml = spam-ml ++ [ + { mail = "unreal@rtinf.net"; } + ]; krebstel-ml = [ config.krebs.users."0x4A6F" { mail = "krebstel-1rxz0mqa95nkmk298s1731ly0ii7vc36kkm36pnjj89hrq52pgn1@ni.r"; } @@ -32,6 +34,7 @@ in { in { "brain@krebsco.de" = brain-ml; "eloop2022@krebsco.de" = eloop-ml; + "2024@eloop.org" = 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 diff --git a/krebs/3modules/git.nix b/krebs/3modules/git.nix index c00a63702..6d666b6d6 100644 --- a/krebs/3modules/git.nix +++ b/krebs/3modules/git.nix @@ -393,11 +393,10 @@ let services.fcgiwrap.instances.cgit = { process.user = cfg.cgit.fcgiwrap.user.name; - socket.user = cfg.cgit.fcgiwrap.user.name; process.group = cfg.cgit.fcgiwrap.group.name; - socket.group = cfg.cgit.fcgiwrap.group.name; - socket.address = "/run/fcgiwrap.sock"; - # socket.type = "unix" (default) + socket.user = cfg.cgit.fcgiwrap.user.name; + socket.group = config.services.nginx.group; + socket.mode = "0660"; }; environment.etc."cgitrc".text = let |