X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=4bbd5cdc931076e5fb825600afdbf05cb39ddc48;hb=1922655a53a11307fc07f6bbcdfec68c1f2a8b33;hp=41f47a3f458305c072fac90711dd7b8d197d788d;hpb=95b20e17b97de1f05392d0c394a5efdc590311a9;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 41f47a3..4bbd5cd 100644 --- a/nixops/modules/websites/tools/tools/default.nix +++ b/nixops/modules/websites/tools/tools/default.nix @@ -21,6 +21,9 @@ let shaarli = pkgs.callPackage ./shaarli.nix { env = myconfig.env.tools.shaarli; }; + dokuwiki = pkgs.callPackage ./dokuwiki.nix { + inherit (mylibs) fetchedGithub; + }; cfg = config.services.myWebsites.tools.tools; in { @@ -32,22 +35,33 @@ in { security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null; services.myWebsites.tools.modules = - adminer.apache.modules + [ "proxy_fcgi" ] + ++ adminer.apache.modules ++ ympd.apache.modules ++ ttrss.apache.modules ++ roundcubemail.apache.modules ++ wallabag.apache.modules ++ yourls.apache.modules ++ rompr.apache.modules - ++ shaarli.apache.modules; + ++ shaarli.apache.modules + ++ dokuwiki.apache.modules; services.ympd = ympd.config // { enable = true; }; services.myWebsites.tools.vhostConfs.tools = { certName = "eldiron"; hosts = ["tools.immae.eu" ]; - root = null; + root = "/var/lib/ftp/tools.immae.eu"; extraConfig = [ + '' + + AllowOverride all + Require all granted + + SetHandler "proxy:unix:/var/run/phpfpm/tools.sock|fcgi://localhost" + + + '' adminer.apache.vhostConf ympd.apache.vhostConf ttrss.apache.vhostConf @@ -56,6 +70,7 @@ in { yourls.apache.vhostConf rompr.apache.vhostConf shaarli.apache.vhostConf + dokuwiki.apache.vhostConf ]; }; @@ -67,6 +82,23 @@ in { yourls = yourls.phpFpm.pool; rompr = rompr.phpFpm.pool; shaarli = shaarli.phpFpm.pool; + dokuwiki = dokuwiki.phpFpm.pool; + tools = '' + listen = /var/run/phpfpm/tools.sock + user = wwwrun + group = wwwrun + listen.owner = wwwrun + listen.group = wwwrun + pm = dynamic + pm.max_children = 60 + pm.start_servers = 2 + pm.min_spare_servers = 1 + pm.max_spare_servers = 10 + + ; Needed to avoid clashes in browser cookies (same domain) + php_value[session.name] = ToolsPHPSESSID + php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/tools.immae.eu:/tmp" + ''; }; system.activationScripts = { @@ -76,6 +108,7 @@ in { yourls = yourls.activationScript; rompr = rompr.activationScript; shaarli = shaarli.activationScript; + dokuwiki = dokuwiki.activationScript; }; systemd.services.tt-rss = {