X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=5db7d3eb5a3e7d4127922ae49186a83fdc7fcd26;hp=4bbd5cdc931076e5fb825600afdbf05cb39ddc48;hb=f80772dc1f1ffb3e6d36ea0b96f71c875bb9b2cd;hpb=1922655a53a11307fc07f6bbcdfec68c1f2a8b33 diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix index 4bbd5cd..5db7d3e 100644 --- a/nixops/modules/websites/tools/tools/default.nix +++ b/nixops/modules/websites/tools/tools/default.nix @@ -24,6 +24,9 @@ let dokuwiki = pkgs.callPackage ./dokuwiki.nix { inherit (mylibs) fetchedGithub; }; + ldap = pkgs.callPackage ./ldap.nix { + env = myconfig.env.tools.phpldapadmin; + }; cfg = config.services.myWebsites.tools.tools; in { @@ -44,7 +47,8 @@ in { ++ yourls.apache.modules ++ rompr.apache.modules ++ shaarli.apache.modules - ++ dokuwiki.apache.modules; + ++ dokuwiki.apache.modules + ++ ldap.apache.modules; services.ympd = ympd.config // { enable = true; }; @@ -71,6 +75,7 @@ in { rompr.apache.vhostConf shaarli.apache.vhostConf dokuwiki.apache.vhostConf + ldap.apache.vhostConf ]; }; @@ -83,6 +88,7 @@ in { rompr = rompr.phpFpm.pool; shaarli = shaarli.phpFpm.pool; dokuwiki = dokuwiki.phpFpm.pool; + ldap = ldap.phpFpm.pool; tools = '' listen = /var/run/phpfpm/tools.sock user = wwwrun