Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
9af8bb1b1e
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user