diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-06-15 16:00:08 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-06-15 16:00:08 +0200 |
commit | b1b8a5623d22a7ee4301afe4e7b9d368ef7ded8f (patch) | |
tree | c04fd6c2102027331b355583102b26a704c41ae2 /modules/webapps/webstats/default.nix | |
parent | cb589b2e41d966719ab7c21ea6dbf0869c3b0eed (diff) | |
download | Nix-b1b8a5623d22a7ee4301afe4e7b9d368ef7ded8f.tar.gz Nix-b1b8a5623d22a7ee4301afe4e7b9d368ef7ded8f.tar.zst Nix-b1b8a5623d22a7ee4301afe4e7b9d368ef7ded8f.zip |
Upgrade goaccess and adjust parsing
Diffstat (limited to 'modules/webapps/webstats/default.nix')
-rw-r--r-- | modules/webapps/webstats/default.nix | 5 |
1 files changed, 2 insertions, 3 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 { | |||
57 | #!${pkgs.stdenv.shell} | 57 | #!${pkgs.stdenv.shell} |
58 | set -e | 58 | set -e |
59 | shopt -s nullglob | 59 | shopt -s nullglob |
60 | date_regex=$(LC_ALL=C date -d yesterday +'%d\/%b\/%Y') | ||
61 | TMPFILE=$(mktemp) | 60 | TMPFILE=$(mktemp) |
62 | trap "rm -f $TMPFILE" EXIT | 61 | trap "rm -f $TMPFILE" EXIT |
63 | 62 | ||
64 | mkdir -p ${cfg.dataDir}/${domain} | 63 | mkdir -p ${cfg.dataDir}/${domain} |
65 | cat /var/log/httpd/access-${domain}.log | sed -n "/\\[$date_regex/ p" > $TMPFILE | ||
66 | for i in /var/log/httpd/access-${domain}*.gz; do | 64 | for i in /var/log/httpd/access-${domain}*.gz; do |
67 | zcat "$i" | sed -n "/\\[$date_regex/ p" >> $TMPFILE | 65 | zcat "$i" >> $TMPFILE |
68 | done | 66 | done |
67 | cat /var/log/httpd/access-${domain}.log > $TMPFILE | ||
69 | ${pkgs.goaccess}/bin/goaccess $TMPFILE --no-progress -o ${cfg.dataDir}/${domain}/index.html -p ${config} | 68 | ${pkgs.goaccess}/bin/goaccess $TMPFILE --no-progress -o ${cfg.dataDir}/${domain}/index.html -p ${config} |
70 | ''; | 69 | ''; |
71 | in "${d}/bin/stats-${domain}"; | 70 | in "${d}/bin/stats-${domain}"; |