diff options
Diffstat (limited to 'virtual/eldiron.nix')
-rw-r--r-- | virtual/eldiron.nix | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix index a1e6909..e1edc01 100644 --- a/virtual/eldiron.nix +++ b/virtual/eldiron.nix | |||
@@ -36,19 +36,6 @@ | |||
36 | services.myWebsites.production.enable = true; | 36 | services.myWebsites.production.enable = true; |
37 | services.myWebsites.integration.enable = true; | 37 | services.myWebsites.integration.enable = true; |
38 | 38 | ||
39 | nixpkgs.config.packageOverrides = oldpkgs: rec { | ||
40 | goaccess = oldpkgs.goaccess.overrideAttrs(old: rec { | ||
41 | name = "goaccess-${version}"; | ||
42 | version = "1.3"; | ||
43 | src = pkgs.fetchurl { | ||
44 | url = "https://tar.goaccess.io/${name}.tar.gz"; | ||
45 | sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc"; | ||
46 | }; | ||
47 | configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ]; | ||
48 | buildInputs = old.buildInputs ++ [ pkgs.tokyocabinet pkgs.bzip2 ]; | ||
49 | }); | ||
50 | }; | ||
51 | |||
52 | networking = { | 39 | networking = { |
53 | firewall = { | 40 | firewall = { |
54 | enable = true; | 41 | enable = true; |
@@ -96,7 +83,6 @@ | |||
96 | pkgs.telnet | 83 | pkgs.telnet |
97 | pkgs.htop | 84 | pkgs.htop |
98 | pkgs.vim | 85 | pkgs.vim |
99 | pkgs.goaccess | ||
100 | occ | 86 | occ |
101 | ]; | 87 | ]; |
102 | 88 | ||
@@ -152,15 +138,6 @@ | |||
152 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/mantisbt | 138 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/mantisbt |
153 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/davical | 139 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/davical |
154 | ''; | 140 | ''; |
155 | # FIXME: initial sync | ||
156 | goaccess = '' | ||
157 | mkdir -p /var/lib/goaccess | ||
158 | mkdir -p /var/lib/goaccess/aten.pro | ||
159 | mkdir -p /var/lib/goaccess/ludivinecassal.com | ||
160 | mkdir -p /var/lib/goaccess/piedsjaloux.fr | ||
161 | mkdir -p /var/lib/goaccess/osteopathe-cc.fr | ||
162 | mkdir -p /var/lib/goaccess/connexionswing.com | ||
163 | ''; | ||
164 | }; | 141 | }; |
165 | 142 | ||
166 | environment.etc."ssh/ldap_authorized_keys" = let | 143 | environment.etc."ssh/ldap_authorized_keys" = let |
@@ -331,36 +308,6 @@ | |||
331 | ]; | 308 | ]; |
332 | }; | 309 | }; |
333 | 310 | ||
334 | services.cron = { | ||
335 | enable = true; | ||
336 | systemCronJobs = let | ||
337 | stats = domain: conf: let | ||
338 | d = pkgs.writeScriptBin "stats-${domain}" '' | ||
339 | #!${pkgs.stdenv.shell} | ||
340 | set -e | ||
341 | shopt -s nullglob | ||
342 | date_regex=$(LC_ALL=C date -d yesterday +'%d\/%b\/%Y') | ||
343 | TMPFILE=$(mktemp) | ||
344 | trap "rm -f $TMPFILE" EXIT | ||
345 | |||
346 | cat /var/log/httpd/access_log-${domain} | sed -n "/\\[$date_regex/ p" > $TMPFILE | ||
347 | for i in /var/log/httpd/access_log-${domain}*.gz; do | ||
348 | zcat "$i" | sed -n "/\\[$date_regex/ p" >> $TMPFILE | ||
349 | done | ||
350 | goaccess $TMPFILE --no-progress -o /var/lib/goaccess/${domain}/index.html -p ${conf} | ||
351 | ''; | ||
352 | in "${d}/bin/stats-${domain}"; | ||
353 | # FIXME: running several goaccess simultaneously seems to be | ||
354 | # bugged? | ||
355 | in [ | ||
356 | "5 0 * * * root ${stats "aten.pro" ./packages/aten_goaccess.conf}" | ||
357 | "6 0 * * * root ${stats "ludivinecassal.com" ./packages/ludivinecassal_goaccess.conf}" | ||
358 | "7 0 * * * root ${stats "piedsjaloux.fr" ./packages/piedsjaloux_goaccess.conf}" | ||
359 | "8 0 * * * root ${stats "osteopathe-cc.fr" ./packages/chloe_goaccess.conf}" | ||
360 | "9 0 * * * root ${stats "connexionswing.com" ./packages/connexionswing_goaccess.conf}" | ||
361 | ]; | ||
362 | }; | ||
363 | |||
364 | systemd.services.tt-rss = { | 311 | systemd.services.tt-rss = { |
365 | description = "Tiny Tiny RSS feeds update daemon"; | 312 | description = "Tiny Tiny RSS feeds update daemon"; |
366 | serviceConfig = { | 313 | serviceConfig = { |