crans
/
nixos
mirror of https://gitlab.crans.org/nounous/nixos
19
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix logs

hachino-test
Pyjacpp 2026-07-21 18:53:45 +02:00
parent 11b39e46a1
commit a4a04f1fb8
No known key found for this signature in database
GPG Key ID: ED479A5A26930939
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/services/reverseproxy.nix
View File

@ -152,11 +152,7 @@ in
nginx-logs = { nginx-logs = {
text = text =
lib.concatMapStrings (f: "mkdir -p /var/log/nginx/${f}/\n") ( lib.concatMapStrings (f: "mkdir -p /var/log/nginx/${f}/\n") (
[ [ "anubis" ] ++ (lib.map (hn: "host/${hn}") (builtins.attrNames cfg.virtualHosts))
"anubis"
"aliases"
]
++ (lib.map (hn: "host/${hn}") (builtins.attrNames cfg.virtualHosts))
) )
+ "chown -R ${config.services.nginx.user}:${config.services.nginx.group} /var/log/nginx/\n"; + "chown -R ${config.services.nginx.user}:${config.services.nginx.group} /var/log/nginx/\n";
}; };
@ -195,19 +191,16 @@ in
su = "${config.services.nginx.user} ${config.services.nginx.group}"; su = "${config.services.nginx.user} ${config.services.nginx.group}";
postrotate = "[ ! -f /var/run/nginx/nginx.pid ] || kill -USR1 `cat /var/run/nginx/nginx.pid`"; postrotate = "[ ! -f /var/run/nginx/nginx.pid ] || kill -USR1 `cat /var/run/nginx/nginx.pid`";
frequency = "daily"; frequency = "daily";
notifempty = true; ifempty = true;
compress = true;
delaycompress = true;
dateyesterday = true;
}; };
in in
{ {
nginx-anubis = base // { nginx-anubis = base // {
files = [ "/var/log/nginx/anubis/*.log" ]; files = [ "/var/log/nginx/anubis/*.log" ];
rotate = 7; # une semaine de log pour débugguer rotate = 7; # une semaine de log pour débugguer
delaycompress = false;
};
nginx-aliases = base // {
files = [ "/var/log/nginx/aliases/*.log" ];
rotate = 7; # une semaine de log pour débugguer
delaycompress = false;
}; };
nginx-hosts = base // { nginx-hosts = base // {
files = [ "/var/log/nginx/host/*/*.log" ]; files = [ "/var/log/nginx/host/*/*.log" ];
@ -255,6 +248,11 @@ in
# Il est en entrée # Il est en entrée
entryExtraConf; entryExtraConf;
logHostConf = ''
access_log /var/log/nginx/host/${vhostName}/access.log;
error_log /var/log/nginx/host/${vhostName}/error.log;
'';
# Les alias : vhostName × otherTld U serverAliases × allTld # Les alias : vhostName × otherTld U serverAliases × allTld
mkHostName = als: tld: if als == "." then "crans.${tld}" else "${als}.crans.${tld}"; mkHostName = als: tld: if als == "." then "crans.${tld}" else "${als}.crans.${tld}";
aliases = aliases =
@ -279,10 +277,7 @@ in
}; };
root = vhostConfig.serveLocalFiles; root = vhostConfig.serveLocalFiles;
globalRedirect = vhostConfig.globalRedirect; globalRedirect = vhostConfig.globalRedirect;
extraConfig = vhostExtraConf.extraConfig + '' extraConfig = vhostExtraConf.extraConfig + logHostConf;
access_log /var/log/nginx/host/${vhostName}/access.log;
error_log /var/log/nginx/host/${vhostName}/error.log;
'';
}; };
# Entrée d’Anubis # Entrée d’Anubis
@ -307,10 +302,7 @@ in
"${vhostName}-alias-${alias}" = sslConf // { "${vhostName}-alias-${alias}" = sslConf // {
serverName = alias; serverName = alias;
globalRedirect = lib.defaultTo "${vhostName}.crans.${mainTld}" vhostConfig.globalRedirect; globalRedirect = lib.defaultTo "${vhostName}.crans.${mainTld}" vhostConfig.globalRedirect;
extraConfig = '' extraConfig = logHostConf;
access_log /var/log/nginx/aliases/access.log;
error_log /var/log/nginx/aliases/eror.log;
'';
}; };
}) aliases }) aliases
); );