Try to fix goaccess cron not running

[perso/Immae/Config/Nix.git] / virtual / eldiron.nix

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 172b3697f878c956b9262e01df6f69f0d9cce901..b9dba3f79b3d91ba3ccf3f4dc28257c9e7209858 100644 (file)
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -175,20 +175,20 @@
           "www.osteopathe-cc.fr" = null;
         };
       };
-      # "connexionswing" = {
-      #   webroot = "/var/lib/acme/acme-challenge";
-      #   email = "ismael@bouya.org";
-      #   domain = "connexionswing.com";
-      #   plugins = [ "cert.pem" "chain.pem" "fullchain.pem" "full.pem" "key.pem" "account_key.json" ];
-      #   postRun = ''
-      #     systemctl reload httpd.service
-      #   '';
-      #   extraDomains = {
-      #     "www.connexionswing.com" = null;
-      #     "sandetludo.com" = null;
-      #     "www.sandetludo.com" = null;
-      #   };
-      # };
+      "connexionswing" = {
+        webroot = "/var/lib/acme/acme-challenge";
+        email = "ismael@bouya.org";
+        domain = "connexionswing.com";
+        plugins = [ "cert.pem" "chain.pem" "fullchain.pem" "full.pem" "key.pem" "account_key.json" ];
+        postRun = ''
+          systemctl reload httpd.service
+        '';
+        extraDomains = {
+          "www.connexionswing.com" = null;
+          "sandetludo.com" = null;
+          "www.sandetludo.com" = null;
+        };
+      };
     };
 
     services.openssh.extraConfig = ''
@@ -315,6 +315,7 @@
         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
         '';
     };
 
@@ -472,6 +473,14 @@
             mypkgs.connexionswing_dev.apache.vhostConf
           ];
         })
+        (withConf "connexionswing" // {
+          hostName = "connexionswing.com";
+          serverAliases = [ "sandetludo.com" "www.connexionswing.com" "www.sandetludo.com" ];
+          documentRoot = mypkgs.connexionswing_prod.webRoot;
+          extraConfig = builtins.concatStringsSep "\n" [
+            mypkgs.connexionswing_prod.apache.vhostConf
+          ];
+        })
         (withConf "eldiron" // {
           hostName = "ludivine.immae.eu";
           documentRoot = mypkgs.ludivinecassal_dev.webRoot;
@@ -654,11 +663,14 @@
         stats = domain: conf: let
           d = pkgs.writeScriptBin "stats-${domain}" "${pkgs.gnused}/bin/sed -n '/\\['$(LC_ALL=C ${pkgs.coreutils}/bin/date -d yesterday +'%d\\/%b\\/%Y')'/ p' /var/log/httpd/access_log-${domain} | ${pkgs.goaccess}/bin/goaccess -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}"
-        "5 0 * * * root ${stats "ludivinecassal.com" ./packages/ludivinecassal_goaccess.conf}"
-        "5 0 * * * root ${stats "piedsjaloux.fr" ./packages/piedsjaloux_goaccess.conf}"
-        "5 0 * * * root ${stats "osteopathe-cc.fr" ./packages/chloe_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}"
         ];
     };