X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=e8722242c5c7494bfc410ba917f49ea6a58a1353;hb=f5efae0f8c4c53798f8f9fc88c5f92f38a223320;hp=d3092876169b03e9941c20b2d22721621907ed0d;hpb=0aae0181fd46ca043eef4195e34b4c4bba20349e;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 d309287..e872224 100644 --- a/nixops/modules/websites/tools/tools/default.nix +++ b/nixops/modules/websites/tools/tools/default.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; @@ -72,7 +73,14 @@ in { ++ ldap.apache.modules ++ kanboard.apache.modules; - services.ympd = ympd.config // { enable = true; }; + systemd.services.ympd = { + description = "Standalone MPD Web GUI written in C"; + wantedBy = [ "multi-user.target" ]; + script = '' + 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 + ''; + }; services.myWebsites.integration.vhostConfs.devtools = { certName = "eldiron"; @@ -168,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; @@ -238,10 +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); - }) ]; - systemd.services.tt-rss = { description = "Tiny Tiny RSS feeds update daemon"; serviceConfig = {