X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fftp%2Fimmae.nix;h=e188d95d8787e7f255e64d67e165ec33bae9d8d1;hb=daf64e3f7de98e4267823d14fa34891b27b5f657;hp=6acfe44c15d2d8a483fe4aebdc5d2d06a84b2dd2;hpb=f759f52e50c1099724c0a172cbebfdcb0823a25f;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/ftp/immae.nix b/nixops/modules/websites/ftp/immae.nix
index 6acfe44..e188d95 100644
--- a/nixops/modules/websites/ftp/immae.nix
+++ b/nixops/modules/websites/ftp/immae.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig,  ... }:
 let
     cfg = config.services.myWebsites.Immae;
     varDir = "/var/lib/ftp/immae";
@@ -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;
 
@@ -38,8 +28,8 @@ in {
 
       php_admin_value[open_basedir] = "${varDir}:/tmp"
       '';
-    services.myWebsites.production.modules = [ "proxy_fcgi" ];
-    services.myWebsites.production.vhostConfs.immae = {
+    services.websites.production.modules = [ "proxy_fcgi" ];
+    services.websites.production.vhostConfs.immae = {
       certName    = "eldiron";
       hosts       = [ "www.immae.eu" ];
       root        = varDir;
@@ -65,5 +55,16 @@ in {
         ''
       ];
     };
+
+    security.acme.certs."eldiron".extraDomains."bouya.org" = null;
+    security.acme.certs."eldiron".extraDomains."www.bouya.org" = null;
+    services.websites.production.vhostConfs.bouya = {
+      certName    = "eldiron";
+      hosts       = [ "bouya.org" "www.bouya.org" ];
+      root        = null;
+      extraConfig = [ ''
+        RedirectMatch 301 ^/((?!\.well-known.*$).*)$ https://www.normalesup.org/~bouya/
+        '' ];
+    };
   };
 }