Move webstats outside of nixops

[perso/Immae/Config/Nix.git] / nixops / modules / websites / ftp / immae.nix

diff --git a/nixops/modules/websites/ftp/immae.nix b/nixops/modules/websites/ftp/immae.nix
index 6acfe44c15d2d8a483fe4aebdc5d2d06a84b2dd2..d4e6d39c4f50419120d42675e6f97c511181985b 100644 (file)
--- a/nixops/modules/websites/ftp/immae.nix
+++ b/nixops/modules/websites/ftp/immae.nix
@@ -10,18 +10,8 @@ in {
     };
   };
 
-  imports = [
-    ../commons/stats.nix
-  ];
-
   config = lib.mkIf cfg.production.enable {
-    services.myWebsites.commons.stats.enable = true;
-    services.myWebsites.commons.stats.sites = [
-      {
-        name = "www.immae.eu";
-        conf = ./immae_goaccess.conf;
-      }
-    ];
+    services.webstats.sites = [ { name = "www.immae.eu"; } ];
 
     security.acme.certs."eldiron".extraDomains."www.immae.eu" = null;
 
@@ -65,5 +55,16 @@ in {
         ''
       ];
     };
+
+    security.acme.certs."eldiron".extraDomains."bouya.org" = null;
+    security.acme.certs."eldiron".extraDomains."www.bouya.org" = null;
+    services.myWebsites.production.vhostConfs.bouya = {
+      certName    = "eldiron";
+      hosts       = [ "bouya.org" "www.bouya.org" ];
+      root        = null;
+      extraConfig = [ ''
+        RedirectMatch 301 ^/((?!\.well-known.*$).*)$ https://www.normalesup.org/~bouya/
+        '' ];
+    };
   };
 }