X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=f88cf061e72d70641c5c8911b66c58d2a825743c;hb=0f71cd76014c2c4eb6756d8c04eb51b3e4452958;hp=5a0c196737a3a4bd4472ca9aac5f1b929923551f;hpb=ab8f306d7c2c49b8116e1af7b355ed2384617ed9;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 5a0c196..f88cf06 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -74,12 +74,15 @@ in {
       ++ kanboard.apache.modules;
 
     services.websites.env.integration.vhostConfs.devtools = {
-      certName    = "eldiron";
-      addToCerts  = true;
-      hosts       = ["devtools.immae.eu" ];
-      root        = "/var/lib/ftp/devtools.immae.eu";
-      extraConfig = [
+      certName     = "integration";
+      certMainHost = "devtools.immae.eu";
+      addToCerts   = true;
+      hosts        = [ "devtools.immae.eu" ];
+      root         = "/var/lib/ftp/devtools.immae.eu";
+      extraConfig  = [
         ''
+          Timeout 600
+          ProxyTimeout 600
           <Directory "/var/lib/ftp/devtools.immae.eu">
             DirectoryIndex index.php index.htm index.html
             AllowOverride all
@@ -100,6 +103,7 @@ in {
       extraConfig = [
         ''
           RedirectMatch 301 ^/roundcube(.*)$   https://mail.immae.eu/roundcube$1
+          RedirectMatch 301 ^/jappix(.*)$      https://im.immae.fr/converse
 
           <Directory "/var/lib/ftp/tools.immae.eu">
             DirectoryIndex index.php index.htm index.html
@@ -146,6 +150,8 @@ in {
 
         RedirectMatch 301 ^/roundcube(.*)$   https://mail.immae.eu/roundcube$1
 
+        RedirectMatch 301 ^/jappix(.*)$      https://im.immae.fr/converse
+
         RedirectMatch 301 ^/(.*)$            https://tools.immae.eu/$1
         ''
       ];