X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=333ffb0c79e9cf6129b34f7340dd1ccf20bb4650;hb=bfe3c9c9df0c5112bc8806483292b55ed0f7e02d;hp=d69ccc9c6497142a9a44ffa507a694af664a8d3d;hpb=aebd817b115c1a26a4ec70e5cab9af55ea2c1294;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/modules/websites/tools/tools/default.nix b/virtual/modules/websites/tools/tools/default.nix
index d69ccc9..333ffb0 100644
--- a/virtual/modules/websites/tools/tools/default.nix
+++ b/virtual/modules/websites/tools/tools/default.nix
@@ -1,10 +1,23 @@
-{ lib, pkgs, config, mylibs, ... }:
+{ lib, pkgs, config, myconfig, mylibs, ... }:
 let
     adminer = pkgs.callPackage ../../commons/adminer.nix {};
-    ympd = pkgs.callPackage ./ympd.nix {};
-    ttrss = pkgs.callPackage ./ttrss.nix { inherit (mylibs) checkEnv fetchedGithub fetchedGit; };
-    roundcubemail = pkgs.callPackage ./roundcubemail.nix { inherit (mylibs) checkEnv; };
-    wallabag = pkgs.callPackage ./wallabag.nix { inherit (mylibs) checkEnv; };
+    ympd = pkgs.callPackage ./ympd.nix {
+      env = myconfig.env.tools.ympd;
+    };
+    ttrss = pkgs.callPackage ./ttrss.nix {
+      inherit (mylibs) fetchedGithub fetchedGit;
+      env = myconfig.env.tools.ttrss;
+    };
+    roundcubemail = pkgs.callPackage ./roundcubemail.nix { env = myconfig.env.tools.roundcubemail; };
+    wallabag = pkgs.callPackage ./wallabag.nix { env = myconfig.env.tools.wallabag; };
+    yourls = pkgs.callPackage ./yourls.nix {
+      inherit (mylibs) fetchedGithub;
+      env = myconfig.env.tools.yourls;
+    };
+    rompr = pkgs.callPackage ./rompr.nix {
+      inherit (mylibs) fetchedGithub;
+      env = myconfig.env.tools.rompr;
+    };
 
     cfg = config.services.myWebsites.tools.tools;
 in {
@@ -20,9 +33,11 @@ in {
       ++ ympd.apache.modules
       ++ ttrss.apache.modules
       ++ roundcubemail.apache.modules
-      ++ wallabag.apache.modules;
+      ++ wallabag.apache.modules
+      ++ yourls.apache.modules
+      ++ rompr.apache.modules;
 
-    services.ympd = ympd.config // { enable = false; };
+    services.ympd = ympd.config // { enable = true; };
 
     services.myWebsites.tools.vhostConfs.tools = {
       certName    = "eldiron";
@@ -34,6 +49,8 @@ in {
         ttrss.apache.vhostConf
         roundcubemail.apache.vhostConf
         wallabag.apache.vhostConf
+        yourls.apache.vhostConf
+        rompr.apache.vhostConf
       ];
     };
 
@@ -42,12 +59,16 @@ in {
       ttrss = ttrss.phpFpm.pool;
       roundcubemail = roundcubemail.phpFpm.pool;
       wallabag = wallabag.phpFpm.pool;
+      yourls = yourls.phpFpm.pool;
+      rompr = rompr.phpFpm.pool;
     };
 
     system.activationScripts = {
       ttrss = ttrss.activationScript;
       roundcubemail = roundcubemail.activationScript;
       wallabag = wallabag.activationScript;
+      yourls = yourls.activationScript;
+      rompr = rompr.activationScript;
     };
 
     systemd.services.tt-rss = {