X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=systems%2Feldiron%2Fwebstats%2Fdefault.nix;fp=modules%2Fwebapps%2Fwebstats%2Fdefault.nix;h=0057f641bf6075ca4a3a32ee2c9bf7898afb403b;hb=1a64deeb894dc95e2645a75771732c6cc53a79ad;hp=e873af2b0aa0db194bcd75a3743161a6d360a0f8;hpb=fa25ffd4583cc362075cd5e1b4130f33306103f0;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/webapps/webstats/default.nix b/systems/eldiron/webstats/default.nix
similarity index 90%
rename from modules/webapps/webstats/default.nix
rename to systems/eldiron/webstats/default.nix
index e873af2..0057f64 100644
--- a/modules/webapps/webstats/default.nix
+++ b/systems/eldiron/webstats/default.nix
@@ -37,7 +37,7 @@ in {
   };
 
   config = lib.mkIf (builtins.length cfg.sites > 0) {
-    users.users.root.packages = [
+    environment.systemPackages = [
       pkgs.goaccess
     ];
 
@@ -58,10 +58,10 @@ in {
             trap "rm -f $TMPFILE" EXIT
 
             mkdir -p ${cfg.dataDir}/${domain}
-            for i in /var/log/httpd/access-${domain}*.gz; do
+            for i in /var/log/httpd/access-${domain}*.gz /var/log/httpd/*/access-${domain}*.gz; do
               zcat "$i" >> $TMPFILE
             done
-            cat /var/log/httpd/access-${domain}.log > $TMPFILE
+            cat /var/log/httpd/*access-${domain}.log /var/log/httpd/*/access-${domain}.log > $TMPFILE
             ${pkgs.goaccess}/bin/goaccess $TMPFILE --no-progress -o ${cfg.dataDir}/${domain}/index.html -p ${config}
             '';
           in "${d}/bin/stats-${domain}";