X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdokuwiki.nix;h=83bd1238d3faf37b675967842826913292023371;hb=bbea22c02b6c059a6be1064391f06737ee244ba6;hp=c61d15f2547a0e91410240b855b99ad675c350f0;hpb=4288c2f2431fb782b0d512b1b3749187f2374b6a;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/tools/tools/dokuwiki.nix b/modules/private/websites/tools/tools/dokuwiki.nix
index c61d15f..83bd123 100644
--- a/modules/private/websites/tools/tools/dokuwiki.nix
+++ b/modules/private/websites/tools/tools/dokuwiki.nix
@@ -13,22 +13,57 @@ rec {
         chown -R ${apache.user}:${apache.user} ${varDir}/config ${varDir}/data
         chmod -R 755 ${varDir}/config ${varDir}/data
       fi
-      install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
     '';
   };
-  webRoot = dokuwiki.withPlugins (builtins.attrValues dokuwiki-plugins);
+  chatonsHostingProperties = {
+    file.datetime = "2022-08-21T22:50:00";
+    hosting = {
+      name = "Dokuwiki";
+      description = "DokuWiki is a simple to use and highly versatile Open Source wiki software";
+      website = "https://tools.immae.eu/dokuwiki/";
+      logo = "https://tools.immae.eu/dokuwiki/lib/tpl/dokuwiki/images/apple-touch-icon.png";
+      type = "INSTANCE";
+      status.level = "OK";
+      status.description = "OK";
+      registration.load = "OPEN";
+      install.type = "PACKAGE";
+    };
+  };
+  chatonsProperties = {
+    file.datetime = "2022-08-21T22:50:00";
+    service = {
+      name = "Dokuwiki";
+      description = "DokuWiki is a simple to use and highly versatile Open Source wiki software";
+      website = "https://tools.immae.eu/dokuwiki/";
+      logo = "https://tools.immae.eu/dokuwiki/lib/tpl/dokuwiki/images/apple-touch-icon.png";
+      status.level = "OK";
+      status.description = "OK";
+      registration."" = ["MEMBER" "CLIENT"];
+      registration.load = "OPEN";
+      install.type = "PACKAGE";
+    };
+    software = {
+      name = "Dokuwiki";
+      website = "https://www.dokuwiki.org/dokuwiki";
+      license.url = "http://www.gnu.org/licenses/gpl-2.0.html";
+      license.name = "GNU General Public License Version 2";
+      version = webRoot.version;
+      source.url = "https://download.dokuwiki.org/";
+      modules = map (a: a.pluginName) webRoot.plugins;
+    };
+  };
+  webRoot = dokuwiki.withPlugins (p: [ p.farmer p.todo ]);
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";
     modules = [ "proxy_fcgi" ];
-    webappName = "tools_dokuwiki";
-    root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    root = webRoot;
+    vhostConf = socket: ''
       Alias /dokuwiki "${root}"
       <Directory "${root}">
         DirectoryIndex index.php
         <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
         </FilesMatch>
 
         AllowOverride All
@@ -41,21 +76,18 @@ rec {
     serviceDeps = [ "openldap.service" ];
     basedir = builtins.concatStringsSep ":" (
       [ webRoot varDir ] ++ webRoot.plugins);
-    socket = "/var/run/phpfpm/dokuwiki.sock";
-    pool = ''
-      listen = ${socket}
-      user = ${apache.user}
-      group = ${apache.group}
-      listen.owner = ${apache.user}
-      listen.group = ${apache.group}
-      pm = ondemand
-      pm.max_children = 60
-      pm.process_idle_timeout = 60
+    pool = {
+      "listen.owner" = apache.user;
+      "listen.group" = apache.group;
+      "pm" = "ondemand";
+      "pm.max_children" = "60";
+      "pm.process_idle_timeout" = "60";
 
-      ; Needed to avoid clashes in browser cookies (same domain)
-      php_value[session.name] = DokuwikiPHPSESSID
-      php_admin_value[open_basedir] = "${basedir}:/tmp"
-      php_admin_value[session.save_path] = "${varDir}/phpSessions"
-      '';
+      # Needed to avoid clashes in browser cookies (same domain)
+      "php_value[session.name]" = "DokuwikiPHPSESSID";
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp";
+      "php_admin_value[session.save_handler]" = "redis";
+      "php_admin_value[session.save_path]" = "'unix:///run/redis-php-sessions/redis.sock?persistent=1&prefix=Tools:Dokuwiki:'";
+    };
   };
 }