From 2a5cde8d47d5c887067176555596cf8feb5c4d8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sun, 12 May 2019 15:19:46 +0200
Subject: Remove some activationScript and move them to preStart scripts

---
 modules/webapps/webstats/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'modules/webapps/webstats/default.nix')

diff --git a/modules/webapps/webstats/default.nix b/modules/webapps/webstats/default.nix
index f4916bd..feff951 100644
--- a/modules/webapps/webstats/default.nix
+++ b/modules/webapps/webstats/default.nix
@@ -58,6 +58,7 @@ in {
             TMPFILE=$(mktemp)
             trap "rm -f $TMPFILE" EXIT
 
+            mkdir -p ${cfg.dataDir}/${domain}
             cat /var/log/httpd/access_log-${domain} | sed -n "/\\[$date_regex/ p" > $TMPFILE
             for i in /var/log/httpd/access_log-${domain}*.gz; do
               zcat "$i" | sed -n "/\\[$date_regex/ p" >> $TMPFILE
@@ -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);
   };
 }
-- 
cgit v1.2.3