Disable ympd and add some fixmes

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

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 3f2ba27886f188a9712cdacdced60c79789ce7ba..96efddc21c64155cd2c34f29f0b453e62a91fe33 100644 (file)
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -94,14 +94,17 @@
         '';
     in [
       pkgs.telnet
+      pkgs.htop
       pkgs.vim
       pkgs.goaccess
       occ
     ];
 
+    # FIXME: doesn't work with httpd?
+    security.acme.preliminarySelfsigned = true;
     security.acme.certs = {
-      # /!\ To create a new certificate, add first the domain to an
-      # existing certificate, deploy, and then use it in httpd.
+      # FIXME: /!\ To create a new certificate, create it before using
+      # it in httpd
       "eldiron" = {
         webroot = "/var/lib/acme/acme-challenge";
         email = "ismael@bouya.org";
@@ -110,6 +113,7 @@
         postRun = ''
           systemctl reload httpd.service
         '';
+        allowKeysForGroup = true;
         extraDomains = {
           "db-1.immae.eu" = null;
           "git.immae.eu" = null;
@@ -159,6 +163,18 @@
           "www.piedsjaloux.fr" = null;
         };
       };
+      "chloe" = {
+        webroot = "/var/lib/acme/acme-challenge";
+        email = "ismael@bouya.org";
+        domain = "osteopathe-cc.fr";
+        plugins = [ "cert.pem" "chain.pem" "fullchain.pem" "full.pem" "key.pem" "account_key.json" ];
+        postRun = ''
+          systemctl reload httpd.service
+        '';
+        extraDomains = {
+          "www.osteopathe-cc.fr" = null;
+        };
+      };
       # "connexionswing" = {
       #   webroot = "/var/lib/acme/acme-challenge";
       #   email = "ismael@bouya.org";
@@ -206,9 +222,10 @@
       adminPubkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXqRbiHw7QoHADNIEuo4nUT9fSOIEBMdJZH0bkQAxXyJFyCM1IMz0pxsHV0wu9tdkkr36bPEUj2aV5bkYLBN6nxcV2Y49X8bjOSCPfx3n6Own1h+NeZVBj4ZByrFmqCbTxUJIZ2bZKcWOFncML39VmWdsVhNjg0X4NBBehqXRIKr2gt3E/ESAxTYJFm0BnU0baciw9cN0bsRGqvFgf5h2P48CIAfwhVcGmPQnnAwabnosYQzRWxR0OygH5Kd8mePh6FheIRIigfXsDO8f/jdxwut8buvNIf3m5EBr3tUbTsvM+eV3M5vKGt7sk8T64DVtepTSdOOWtp+47ktsnHOMh immae@immae.eu";
     };
 
-    services.ympd = mypkgs.ympd.config // { enable = true; };
+    services.ympd = mypkgs.ympd.config // { enable = false; };
 
     services.phpfpm = {
+      # FIXME: move session files to separate dirs
       # /!\ phppackage is used in nextcloud configuation
       phpOptions = ''
         ; For nextcloud
@@ -280,11 +297,13 @@
           fi
         '';
       };
+      # 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
         '';
     };
 
@@ -315,6 +334,7 @@
       basePath = "${mypkgs.git.web.varDir}/repositories";
     };
 
+    # FIXME: logrotate
     services.httpd = let
       withConf = domain: {
         enableSSL = true;
@@ -474,7 +494,7 @@
             mypkgs.chloe_dev.apache.vhostConf
           ];
         })
-        (withConf "eldiron" // {
+        (withConf "chloe" // {
           hostName = "osteopathe-cc.fr";
           serverAliases = [ "www.osteopathe-cc.fr" ];
           documentRoot = mypkgs.chloe_prod.webRoot;
@@ -557,6 +577,7 @@
     ];
 
     # FIXME: backup
+    # Nextcloud: 14
     services.redis = rec {
       enable = true;
       bind = "127.0.0.1";
@@ -615,11 +636,14 @@
     services.cron = {
       enable = true;
       systemCronJobs = let
-        stats = domain: conf: "${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}";
+        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}";
       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}"
         ];
     };
   };