X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Feldiron.nix;fp=virtual%2Feldiron.nix;h=e1edc01e271b1594d7befb4d28607e42129c8476;hb=e4a945cd175fa78ee6373f2a30505c4322befa2b;hp=a1e69091decd65cc158d0fcadf7f22819a1b8691;hpb=f8bde3d6d31da84b5e81bdfc4f96efdf6bec3df2;p=perso%2FImmae%2FConfig%2FNix.git

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 @@
     services.myWebsites.production.enable = true;
     services.myWebsites.integration.enable = true;
 
-    nixpkgs.config.packageOverrides = oldpkgs: rec {
-      goaccess = oldpkgs.goaccess.overrideAttrs(old: rec {
-        name = "goaccess-${version}";
-        version = "1.3";
-        src = pkgs.fetchurl {
-          url = "https://tar.goaccess.io/${name}.tar.gz";
-          sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc";
-        };
-        configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ];
-        buildInputs = old.buildInputs ++ [ pkgs.tokyocabinet pkgs.bzip2 ];
-      });
-    };
-
     networking = {
       firewall = {
         enable = true;
@@ -96,7 +83,6 @@
       pkgs.telnet
       pkgs.htop
       pkgs.vim
-      pkgs.goaccess
       occ
     ];
 
@@ -152,15 +138,6 @@
         install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/mantisbt
         install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/davical
         '';
-      # FIXME: initial sync
-      goaccess = ''
-        mkdir -p /var/lib/goaccess
-        mkdir -p /var/lib/goaccess/aten.pro
-        mkdir -p /var/lib/goaccess/ludivinecassal.com
-        mkdir -p /var/lib/goaccess/piedsjaloux.fr
-        mkdir -p /var/lib/goaccess/osteopathe-cc.fr
-        mkdir -p /var/lib/goaccess/connexionswing.com
-        '';
     };
 
     environment.etc."ssh/ldap_authorized_keys" = let
@@ -331,36 +308,6 @@
       ];
     };
 
-    services.cron = {
-      enable = true;
-      systemCronJobs = let
-        stats = domain: conf: let
-          d = pkgs.writeScriptBin "stats-${domain}" ''
-            #!${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
-
-            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
-            done
-            goaccess $TMPFILE --no-progress -o /var/lib/goaccess/${domain}/index.html -p ${conf}
-            '';
-          in "${d}/bin/stats-${domain}";
-      # FIXME: running several goaccess simultaneously seems to be
-      # bugged?
-      in [
-        "5 0 * * * root ${stats "aten.pro" ./packages/aten_goaccess.conf}"
-        "6 0 * * * root ${stats "ludivinecassal.com" ./packages/ludivinecassal_goaccess.conf}"
-        "7 0 * * * root ${stats "piedsjaloux.fr" ./packages/piedsjaloux_goaccess.conf}"
-        "8 0 * * * root ${stats "osteopathe-cc.fr" ./packages/chloe_goaccess.conf}"
-        "9 0 * * * root ${stats "connexionswing.com" ./packages/connexionswing_goaccess.conf}"
-        ];
-    };
-
     systemd.services.tt-rss = {
       description = "Tiny Tiny RSS feeds update daemon";
       serviceConfig = {