X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=4bbd5cdc931076e5fb825600afdbf05cb39ddc48;hb=1922655a53a11307fc07f6bbcdfec68c1f2a8b33;hp=333ffb0c79e9cf6129b34f7340dd1ccf20bb4650;hpb=01f21083a897b86bf148f1d2bb9c8edca4d3786a;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 333ffb0..4bbd5cd 100644
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -18,6 +18,12 @@ let
       inherit (mylibs) fetchedGithub;
       env = myconfig.env.tools.rompr;
     };
+    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 {
@@ -29,21 +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;
+      ++ rompr.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 = [
+        ''
+          <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
@@ -51,6 +69,8 @@ in {
         wallabag.apache.vhostConf
         yourls.apache.vhostConf
         rompr.apache.vhostConf
+        shaarli.apache.vhostConf
+        dokuwiki.apache.vhostConf
       ];
     };
 
@@ -61,6 +81,24 @@ in {
       wallabag = wallabag.phpFpm.pool;
       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 = {
@@ -69,6 +107,8 @@ in {
       wallabag = wallabag.activationScript;
       yourls = yourls.activationScript;
       rompr = rompr.activationScript;
+      shaarli = shaarli.activationScript;
+      dokuwiki = dokuwiki.activationScript;
     };
 
     systemd.services.tt-rss = {