diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-12 15:19:46 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-05-12 15:19:46 +0200 |
commit | 2a5cde8d47d5c887067176555596cf8feb5c4d8b (patch) | |
tree | 2c35cf30ccce9b4013b681a898938a5efe00c556 /modules/webapps/webstats/default.nix | |
parent | 81b9ff8980a9a235b8915b5779ebc1d2a738a9a3 (diff) | |
download | Nix-2a5cde8d47d5c887067176555596cf8feb5c4d8b.tar.gz Nix-2a5cde8d47d5c887067176555596cf8feb5c4d8b.tar.zst Nix-2a5cde8d47d5c887067176555596cf8feb5c4d8b.zip |
Remove some activationScript and move them to preStart scripts
Diffstat (limited to 'modules/webapps/webstats/default.nix')
-rw-r--r-- | modules/webapps/webstats/default.nix | 7 |
1 files changed, 2 insertions, 5 deletions
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 { | |||
58 | TMPFILE=$(mktemp) | 58 | TMPFILE=$(mktemp) |
59 | trap "rm -f $TMPFILE" EXIT | 59 | trap "rm -f $TMPFILE" EXIT |
60 | 60 | ||
61 | mkdir -p ${cfg.dataDir}/${domain} | ||
61 | cat /var/log/httpd/access_log-${domain} | sed -n "/\\[$date_regex/ p" > $TMPFILE | 62 | cat /var/log/httpd/access_log-${domain} | sed -n "/\\[$date_regex/ p" > $TMPFILE |
62 | for i in /var/log/httpd/access_log-${domain}*.gz; do | 63 | for i in /var/log/httpd/access_log-${domain}*.gz; do |
63 | zcat "$i" | sed -n "/\\[$date_regex/ p" >> $TMPFILE | 64 | zcat "$i" | sed -n "/\\[$date_regex/ p" >> $TMPFILE |
@@ -68,6 +69,7 @@ in { | |||
68 | allStats = sites: pkgs.writeScript "stats" '' | 69 | allStats = sites: pkgs.writeScript "stats" '' |
69 | #!${pkgs.stdenv.shell} | 70 | #!${pkgs.stdenv.shell} |
70 | 71 | ||
72 | mkdir -p ${cfg.dataDir} | ||
71 | ${builtins.concatStringsSep "\n" (map (v: stats v.name v.conf) sites)} | 73 | ${builtins.concatStringsSep "\n" (map (v: stats v.name v.conf) sites)} |
72 | ''; | 74 | ''; |
73 | in | 75 | in |
@@ -75,10 +77,5 @@ in { | |||
75 | "5 0 * * * root ${allStats cfg.sites}" | 77 | "5 0 * * * root ${allStats cfg.sites}" |
76 | ]; | 78 | ]; |
77 | }; | 79 | }; |
78 | |||
79 | system.activationScripts.goaccess = '' | ||
80 | mkdir -p /var/lib/goaccess | ||
81 | '' + | ||
82 | builtins.concatStringsSep "\n" (map (v: "mkdir -p ${cfg.dataDir}/${v.name}") cfg.sites); | ||
83 | }; | 80 | }; |
84 | } | 81 | } |