X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fimmae%2Fproduction.nix;h=8b4998f39c42df7de04fed3539e33cce495433cb;hb=97f5a24bc8839328571b23eb5f910de206ddbe1f;hp=ae4abe0a1157244ca60e6aa0692ce88749f7e0d6;hpb=7130402cfecc196ce79c8f07a9dba71974f085e3;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/immae/production.nix b/modules/private/websites/immae/production.nix
index ae4abe0..8b4998f 100644
--- a/modules/private/websites/immae/production.nix
+++ b/modules/private/websites/immae/production.nix
@@ -1,11 +1,12 @@
 { lib, pkgs, config,  ... }:
 let
   cfg = config.myServices.websites.immae.production;
-  varDir = "/var/lib/buildbot/outputs/immaeEu";
-  coursDir = "/var/lib/buildbot/outputs/cours";
-  rechercheDir = "/var/lib/buildbot/outputs/recherche";
-  recettesDir = "/var/lib/buildbot/outputs/recettes";
-  historyDir = pkgs.callPackage ./history {};
+  varDir = "/var/lib/buildbot/outputs/immae/blog";
+  coursDir = "/var/lib/buildbot/outputs/immae/cours";
+  rechercheDir = "/var/lib/buildbot/outputs/immae/recherche";
+  recettesDir = "/var/lib/buildbot/outputs/immae/recettes";
+  historyDir = "/var/lib/buildbot/outputs/immae/history";
+  docsDir = "/var/lib/buildbot/outputs/immae/docs/";
   env = config.myEnv.websites.immae;
 in {
   options.myServices.websites.immae.production.enable = lib.mkEnableOption "enable Immae's website";
@@ -22,10 +23,10 @@ in {
       extraConfig  = [
         ''
         Use Stats www.immae.eu
+        Header always set Strict-Transport-Security "max-age=31536000"
 
         <LocationMatch /.well-known/(webfinger|host-meta)>
           Header always set Referrer-Policy "strict-origin-when-cross-origin"
-          Header always set Strict-Transport-Security "max-age=31536000"
           RequestHeader set X-Forwarded-Proto "https"
 
           RewriteRule ^(.*)$ https://mastodon.immae.eu%{REQUEST_URI} [QSA,L]
@@ -43,6 +44,21 @@ in {
           Require all granted
         </Directory>
 
+        Alias /.well-known/chatonsinfos ${./chatons}
+        <Directory ${./chatons}>
+          Options Indexes FollowSymLinks MultiViews Includes
+          AllowOverride None
+          Require all granted
+        </Directory>
+
+        Alias /.well-known/matrix ${./matrix}
+        <Directory ${./matrix}>
+          Options Indexes FollowSymLinks MultiViews Includes
+          AllowOverride None
+          Require all granted
+          Header always set Access-Control-Allow-Origin "*"
+        </Directory>
+
         Alias /cours ${coursDir}
         <Directory ${coursDir}>
           DirectoryIndex index.htm index.html
@@ -51,6 +67,22 @@ in {
           Require all granted
         </Directory>
 
+        Alias /docs ${docsDir}
+        <Directory ${docsDir}>
+          DirectoryIndex index.htm index.html
+          Options Indexes FollowSymLinks MultiViews Includes
+          AllowOverride All
+          Require all granted
+        </Directory>
+
+        Alias /eurl ${./eurl}
+        <Directory ${./eurl}>
+          DirectoryIndex index.htm index.html
+          Options Indexes FollowSymLinks MultiViews Includes
+          AllowOverride None
+          Require all granted
+        </Directory>
+
         Alias /recherche ${rechercheDir}
         <Directory ${rechercheDir}>
           DirectoryIndex index.htm index.html
@@ -91,9 +123,14 @@ in {
       certName    = "immae";
       addToCerts  = true;
       hosts       = [ "bouya.org" "www.bouya.org" ];
-      root        = null;
+      root        = rechercheDir;
       extraConfig = [ ''
-        RedirectMatch 301 ^/((?!\.well-known.*$).*)$ https://www.normalesup.org/~bouya/
+        <Directory ${rechercheDir}>
+          DirectoryIndex index.htm index.html
+          Options Indexes FollowSymLinks MultiViews Includes
+          AllowOverride All
+          Require all granted
+        </Directory>
         '' ];
     };
   };