X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fprivate%2Fwebsites%2Fimmae%2Fproduction.nix;h=95a8a41a8f174b008b531b986ae0483d78f6320b;hb=120bcf4d3927f4a0d07513bc54ea5b5fb9b7d809;hp=c63839e6cc43347eb42302af47e7ebf807f95522;hpb=196c6e3c3581dc7f9a477680c278b88b0f5795b6;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/immae/production.nix b/modules/private/websites/immae/production.nix
index c63839e..95a8a41 100644
--- a/modules/private/websites/immae/production.nix
+++ b/modules/private/websites/immae/production.nix
@@ -6,11 +6,13 @@ let
   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";
 
   config = lib.mkIf cfg.enable {
+    myServices.chatonsProperties.enable = true;
     services.webstats.sites = [ { name = "www.immae.eu"; } ];
 
     services.websites.env.production.vhostConfs.immae_production = {
@@ -43,11 +45,12 @@ in {
           Require all granted
         </Directory>
 
-        Alias /.well-known/chatonsinfos ${./chatons}
-        <Directory ${./chatons}>
+        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}
@@ -58,6 +61,23 @@ 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 ${./sarl}
+        Alias /eurl ${./sarl}
+        <Directory ${./sarl}>
+          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
@@ -98,9 +118,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>
         '' ];
     };
   };