From b1b8a5623d22a7ee4301afe4e7b9d368ef7ded8f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Mon, 15 Jun 2020 16:00:08 +0200
Subject: [PATCH] Upgrade goaccess and adjust parsing

---
 modules/webapps/webstats/default.nix   |  5 ++---
 modules/webapps/webstats/goaccess.conf | 13 +++++++------
 overlays/goaccess/default.nix          |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/modules/webapps/webstats/default.nix b/modules/webapps/webstats/default.nix
index fe5f068..7a27741 100644
--- a/modules/webapps/webstats/default.nix
+++ b/modules/webapps/webstats/default.nix
@@ -57,15 +57,14 @@ in {
             #!${pkgs.stdenv.shell}
             set -e
             shopt -s nullglob
-            date_regex=$(LC_ALL=C date -d yesterday +'%d\/%b\/%Y')
             TMPFILE=$(mktemp)
             trap "rm -f $TMPFILE" EXIT
 
             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
+              zcat "$i" >> $TMPFILE
             done
+            cat /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}";
diff --git a/modules/webapps/webstats/goaccess.conf b/modules/webapps/webstats/goaccess.conf
index 4918988..c6c244a 100644
--- a/modules/webapps/webstats/goaccess.conf
+++ b/modules/webapps/webstats/goaccess.conf
@@ -1,26 +1,27 @@
 time-format %H:%M:%S
 date-format %d/%b/%Y
 
-#sur immae.eu
-#log-format %v %h %^[%d:%t %^] "%r" %s %b "%R" "%u" $^
-
 log-format VCOMBINED
 #= %v:%^ %h %^[%d:%t %^] "%r" %s %b "%R" "%u"
 
 html-prefs {"theme":"bright","layout":"vertical"}
 
+# old
 exclude-ip 188.165.209.148
 exclude-ip 178.33.252.96
 exclude-ip 2001:41d0:2:9c94::1
 exclude-ip 2001:41d0:2:9c94::
+# eldiron
 exclude-ip 176.9.151.89
 exclude-ip 2a01:4f8:160:3445::
-exclude-ip 82.255.56.72
+# monitoring-1
+exclude-ip 95.216.164.150
+exclude-ip 2a01:4f9:c010:1c95::
 
 no-query-string true
 
-keep-db-files true
-load-from-disk true
+persist true
+restore true
 db-path @dbPath@
 
 ignore-panel REFERRERS
diff --git a/overlays/goaccess/default.nix b/overlays/goaccess/default.nix
index 12b28f3..6b9758b 100644
--- a/overlays/goaccess/default.nix
+++ b/overlays/goaccess/default.nix
@@ -1,10 +1,10 @@
 self: super: {
   goaccess = super.goaccess.overrideAttrs(old: rec {
     name = "goaccess-${version}";
-    version = "1.3";
+    version = "1.4";
     src = self.fetchurl {
       url = "https://tar.goaccess.io/${name}.tar.gz";
-      sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc";
+      sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8";
     };
     configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ];
     buildInputs = old.buildInputs ++ [ self.tokyocabinet self.bzip2 ];
-- 
2.41.0