Add other tools

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index 0b50a7c2c092f74b675aa40bad2b2f931f335af5..4bbd5cdc931076e5fb825600afdbf05cb39ddc48 100644 (file)
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -35,7 +35,8 @@ 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
@@ -50,8 +51,17 @@ in {
     services.myWebsites.tools.vhostConfs.tools = {
       certName    = "eldiron";
       hosts       = ["tools.immae.eu" ];
-      root        = null;
+      root        = "/var/lib/ftp/tools.immae.eu";
       extraConfig = [
+        ''
+          <Directory "/var/lib/ftp/tools.immae.eu">
+            AllowOverride all
+            Require all granted
+            <FilesMatch "\.php$">
+              SetHandler "proxy:unix:/var/run/phpfpm/tools.sock|fcgi://localhost"
+            </FilesMatch>
+          </Directory>
+          ''
         adminer.apache.vhostConf
         ympd.apache.vhostConf
         ttrss.apache.vhostConf
@@ -73,6 +83,22 @@ in {
       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 = {