Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2024-10-14 19:43:50 +02:00
commit 9af8bb1b1e
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
krebs/2configs/exim-smarthost.nix
View File

@ -16,7 +16,9 @@ in {
makefu makefu
tv tv
]; ];
eloop-ml = spam-ml; eloop-ml = spam-ml ++ [
{ mail = "unreal@rtinf.net"; }
];
krebstel-ml = [ krebstel-ml = [
config.krebs.users."0x4A6F" config.krebs.users."0x4A6F"
{ mail = "krebstel-1rxz0mqa95nkmk298s1731ly0ii7vc36kkm36pnjj89hrq52pgn1@ni.r"; } { mail = "krebstel-1rxz0mqa95nkmk298s1731ly0ii7vc36kkm36pnjj89hrq52pgn1@ni.r"; }
@ -32,6 +34,7 @@ in {
in { in {
"brain@krebsco.de" = brain-ml; "brain@krebsco.de" = brain-ml;
"eloop2022@krebsco.de" = eloop-ml; "eloop2022@krebsco.de" = eloop-ml;
"2024@eloop.org" = eloop-ml;
"root@eloop.org" = eloop-ml; # obsolete, use spam@eloop.org instead "root@eloop.org" = eloop-ml; # obsolete, use spam@eloop.org instead
"spam@eloop.org" = eloop-ml; "spam@eloop.org" = eloop-ml;
"youtube@eloop.org" = eloop-ml; # obsolete, use spam@eloop.org instead "youtube@eloop.org" = eloop-ml; # obsolete, use spam@eloop.org instead

7
krebs/3modules/git.nix
View File

@ -393,11 +393,10 @@ let
services.fcgiwrap.instances.cgit = { services.fcgiwrap.instances.cgit = {
process.user = cfg.cgit.fcgiwrap.user.name; process.user = cfg.cgit.fcgiwrap.user.name;
socket.user = cfg.cgit.fcgiwrap.user.name;
process.group = cfg.cgit.fcgiwrap.group.name; process.group = cfg.cgit.fcgiwrap.group.name;
socket.group = cfg.cgit.fcgiwrap.group.name; socket.user = cfg.cgit.fcgiwrap.user.name;
socket.address = "/run/fcgiwrap.sock"; socket.group = config.services.nginx.group;
# socket.type = "unix" (default) socket.mode = "0660";
}; };
environment.etc."cgitrc".text = let environment.etc."cgitrc".text = let