X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=95679f6850e10e1e95842bbb1c3c56466c1b43d1;hb=5dbe7ba1ad4a46c71cbf0e189de3f3436a530c0d;hp=fc5b48d29b3b43cc1748ac6355806065093bb689;hpb=914dd76ceccc2de3bd5ffa176cf7984ad1bd5581;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index fc5b48d..95679f6 100644
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -23,7 +23,7 @@ let
       env = myconfig.env.tools.yourls;
     };
     rompr = pkgs.callPackage ./rompr.nix {
-      inherit (mylibs) fetchedGithub;
+      inherit (pkgs.webapps) rompr;
       env = myconfig.env.tools.rompr;
     };
     shaarli = pkgs.callPackage ./shaarli.nix {
@@ -33,6 +33,7 @@ let
       inherit (mylibs) fetchedGithub;
     };
     ldap = pkgs.callPackage ./ldap.nix {
+      inherit (pkgs.webapps) phpldapadmin;
       env = myconfig.env.tools.phpldapadmin;
     };
 
@@ -46,14 +47,14 @@ in {
     security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null;
     security.acme.certs."eldiron".extraDomains."devtools.immae.eu" = null;
 
-    deployment.keys =
+    mySecrets.keys =
       kanboard.keys
-      // ldap.keys
-      // roundcubemail.keys
-      // shaarli.keys
-      // ttrss.keys
-      // wallabag.keys
-      // yourls.keys;
+      ++ ldap.keys
+      ++ roundcubemail.keys
+      ++ shaarli.keys
+      ++ ttrss.keys
+      ++ wallabag.keys
+      ++ yourls.keys;
 
     services.myWebsites.integration.modules =
       rainloop.apache.modules;
@@ -76,7 +77,7 @@ in {
       description = "Standalone MPD Web GUI written in C";
       wantedBy = [ "multi-user.target" ];
       script = ''
-        export MPD_PASSWORD=$(cat /run/keys/mpd)
+        export MPD_PASSWORD=$(cat /var/secrets/mpd)
         ${pkgs.ympd}/bin/ympd --host ${ympd.config.host} --port ${toString ympd.config.port} --webport ${ympd.config.webPort} --user nobody
         '';
     };
@@ -175,6 +176,9 @@ in {
         '';
       roundcubemail = roundcubemail.phpFpm.phpConfig;
     };
+    services.myPhpfpm.preStart = {
+      wallabag = wallabag.phpFpm.preStart;
+    };
     services.myPhpfpm.poolConfigs = {
       adminer = adminer.phpFpm.pool;
       ttrss = ttrss.phpFpm.pool;
@@ -245,12 +249,6 @@ in {
       ln -s ${kanboard.webRoot} $out/webapps/${kanboard.apache.webappName}
       '';
 
-    nixpkgs.overlays = [ (self: super: rec {
-      ympd = super.ympd.overrideAttrs(old: mylibs.fetchedGithub ./ympd.json // {
-        patches = (old.patches or []) ++ [ ./ympd-password-env.patch ];
-      });
-    }) ];
-
     systemd.services.tt-rss = {
       description = "Tiny Tiny RSS feeds update daemon";
       serviceConfig = {