X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=e2a39131d4958d50ba6aaaee95f348f7181b0459;hb=c7627e14666fe7dedb91ecc9f3fbd8949182f6e4;hp=3cf3e8e2e034be9156852284b20433f207a3df1f;hpb=d2e703c560bc029c3d607058de2935bbf1cb0559;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 3cf3e8e..e2a3913 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -1,39 +1,42 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config, ... }:
 let
   adminer = pkgs.callPackage ./adminer.nix {
     inherit (pkgs.webapps) adminer;
   };
   ympd = pkgs.callPackage ./ympd.nix {
-    env = myconfig.env.tools.ympd;
+    env = config.myEnv.tools.ympd;
   };
   ttrss = pkgs.callPackage ./ttrss.nix {
     inherit (pkgs.webapps) ttrss ttrss-plugins;
-    env = myconfig.env.tools.ttrss;
+    env = config.myEnv.tools.ttrss;
   };
   kanboard = pkgs.callPackage ./kanboard.nix  {
-    env = myconfig.env.tools.kanboard;
+    env = config.myEnv.tools.kanboard;
   };
   wallabag = pkgs.callPackage ./wallabag.nix {
     inherit (pkgs.webapps) wallabag;
-    env = myconfig.env.tools.wallabag;
+    env = config.myEnv.tools.wallabag;
   };
   yourls = pkgs.callPackage ./yourls.nix {
     inherit (pkgs.webapps) yourls yourls-plugins;
-    env = myconfig.env.tools.yourls;
+    env = config.myEnv.tools.yourls;
   };
   rompr = pkgs.callPackage ./rompr.nix {
     inherit (pkgs.webapps) rompr;
-    env = myconfig.env.tools.rompr;
+    env = config.myEnv.tools.rompr;
   };
   shaarli = pkgs.callPackage ./shaarli.nix {
-    env = myconfig.env.tools.shaarli;
+    env = config.myEnv.tools.shaarli;
   };
   dokuwiki = pkgs.callPackage ./dokuwiki.nix {
     inherit (pkgs.webapps) dokuwiki dokuwiki-plugins;
   };
   ldap = pkgs.callPackage ./ldap.nix {
     inherit (pkgs.webapps) phpldapadmin;
-    env = myconfig.env.tools.phpldapadmin;
+    env = config.myEnv.tools.phpldapadmin;
+  };
+  grocy = pkgs.callPackage ./grocy.nix {
+    inherit (pkgs.webapps) grocy;
   };
 
   cfg = config.myServices.websites.tools.tools;
@@ -53,6 +56,7 @@ in {
 
     services.duplyBackup.profiles = {
       dokuwiki = dokuwiki.backups;
+      grocy = grocy.backups;
       kanboard = kanboard.backups;
       rompr = rompr.backups;
       shaarli = shaarli.backups;
@@ -74,12 +78,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
@@ -99,7 +106,9 @@ in {
       root        = "/var/lib/ftp/tools.immae.eu";
       extraConfig = [
         ''
+          RedirectMatch 301 ^/vpn(.*)$         https://vpn.immae.eu$1
           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
@@ -120,6 +129,7 @@ in {
         dokuwiki.apache.vhostConf
         ldap.apache.vhostConf
         kanboard.apache.vhostConf
+        grocy.apache.vhostConf
       ];
     };
 
@@ -146,6 +156,10 @@ in {
 
         RedirectMatch 301 ^/roundcube(.*)$   https://mail.immae.eu/roundcube$1
 
+        RedirectMatch 301 ^/jappix(.*)$      https://im.immae.fr/converse
+
+        RedirectMatch 301 ^/vpn(.*)$         https://vpn.immae.eu$1
+
         RedirectMatch 301 ^/(.*)$            https://tools.immae.eu/$1
         ''
       ];
@@ -243,6 +257,7 @@ in {
       dokuwiki = dokuwiki.phpFpm.pool;
       ldap = ldap.phpFpm.pool;
       kanboard = kanboard.phpFpm.pool;
+      grocy = grocy.phpFpm.pool;
       tools = ''
         listen = /var/run/phpfpm/tools.sock
         user = wwwrun
@@ -263,6 +278,7 @@ in {
 
     system.activationScripts = {
       adminer = adminer.activationScript;
+      grocy = grocy.activationScript;
       ttrss = ttrss.activationScript;
       wallabag = wallabag.activationScript;
       yourls = yourls.activationScript;
@@ -283,6 +299,7 @@ in {
       "${wallabag.apache.webappName}" = wallabag.webRoot;
       "${yourls.apache.webappName}" = yourls.webRoot;
       "${kanboard.apache.webappName}" = kanboard.webRoot;
+      "${grocy.apache.webappName}" = grocy.webRoot;
     };
 
     services.websites.env.tools.watchPaths = [