Fix logs

modules/services/reverseproxy.nix

@@ -152,11 +152,7 @@ in
       nginx-logs = {
         text =
           lib.concatMapStrings (f: "mkdir -p /var/log/nginx/${f}/\n") (
-            [
-              "anubis"
-              "aliases"
-            ]
-            ++ (lib.map (hn: "host/${hn}") (builtins.attrNames cfg.virtualHosts))
+            [ "anubis" ] ++ (lib.map (hn: "host/${hn}") (builtins.attrNames cfg.virtualHosts))
           )
           + "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}";
             postrotate = "[ ! -f /var/run/nginx/nginx.pid ] || kill -USR1 `cat /var/run/nginx/nginx.pid`";
             frequency = "daily";
-            notifempty = true;
+            ifempty = true;
+            compress = true;
+            delaycompress = true;
+            dateyesterday = true;
           };
         in
         {
           nginx-anubis = base // {
             files = [ "/var/log/nginx/anubis/*.log" ];
             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 // {
             files = [ "/var/log/nginx/host/*/*.log" ];
@@ -255,6 +248,11 @@ in
                   # Il est en entrée
                   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
               mkHostName = als: tld: if als == "." then "crans.${tld}" else "${als}.crans.${tld}";
               aliases =
@@ -279,10 +277,7 @@ in
                 };
                 root = vhostConfig.serveLocalFiles;
                 globalRedirect = vhostConfig.globalRedirect;
-                extraConfig = vhostExtraConf.extraConfig + ''
-                  access_log /var/log/nginx/host/${vhostName}/access.log;
-                  error_log /var/log/nginx/host/${vhostName}/error.log;
-                '';
+                extraConfig = vhostExtraConf.extraConfig + logHostConf;
               };
 
               # Entrée d’Anubis
@@ -307,10 +302,7 @@ in
                 "${vhostName}-alias-${alias}" = sslConf // {
                   serverName = alias;
                   globalRedirect = lib.defaultTo "${vhostName}.crans.${mainTld}" vhostConfig.globalRedirect;
-                  extraConfig = ''
-                    access_log /var/log/nginx/aliases/access.log;
-                    error_log /var/log/nginx/aliases/eror.log;
-                  '';
+                  extraConfig = logHostConf;
                 };
               }) aliases
             );