Add relay restrictions per domain

[perso/Immae/Config/Nix.git] / modules / webapps / webstats / default.nix

diff --git a/modules/webapps/webstats/default.nix b/modules/webapps/webstats/default.nix
index f4916bd011fc03ceb61e4b037a586937cb00e5cb..924d72debdf591af8a5fd4e3fa672fccffa6cca5 100644 (file)
--- a/modules/webapps/webstats/default.nix
+++ b/modules/webapps/webstats/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, ... }:
 let
   name = "goaccess";
   cfg = config.services.webstats;
@@ -58,8 +58,9 @@ in {
             TMPFILE=$(mktemp)
             trap "rm -f $TMPFILE" EXIT
 
-            cat /var/log/httpd/access_log-${domain} | sed -n "/\\[$date_regex/ p" > $TMPFILE
-            for i in /var/log/httpd/access_log-${domain}*.gz; do
+            mkdir -p ${cfg.dataDir}/${domain}
+            cat /var/log/httpd/access-${domain}.log | sed -n "/\\[$date_regex/ p" > $TMPFILE
+            for i in /var/log/httpd/access-${domain}*.gz; do
               zcat "$i" | sed -n "/\\[$date_regex/ p" >> $TMPFILE
             done
             ${pkgs.goaccess}/bin/goaccess $TMPFILE --no-progress -o ${cfg.dataDir}/${domain}/index.html -p ${config}
@@ -68,6 +69,7 @@ in {
         allStats = sites: pkgs.writeScript "stats" ''
           #!${pkgs.stdenv.shell}
 
+          mkdir -p ${cfg.dataDir}
           ${builtins.concatStringsSep "\n" (map (v: stats v.name v.conf) sites)}
           '';
       in
@@ -75,10 +77,5 @@ in {
           "5 0 * * * root ${allStats cfg.sites}"
         ];
     };
-
-    system.activationScripts.goaccess = ''
-      mkdir -p /var/lib/goaccess
-    '' +
-    builtins.concatStringsSep "\n" (map (v: "mkdir -p ${cfg.dataDir}/${v.name}") cfg.sites);
   };
 }