Switch to colemna

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / tools / shaarli.nix

diff --git a/modules/private/websites/tools/tools/shaarli.nix b/modules/private/websites/tools/tools/shaarli.nix
index d11f52517b5977b76d23247dfec2cc7dd56440fb..79fbbc9880487b806fad0445beb764ba65e18980 100644 (file)
--- a/modules/private/websites/tools/tools/shaarli.nix
+++ b/modules/private/websites/tools/tools/shaarli.nix
@@ -1,27 +1,21 @@
-{ lib, env, stdenv, fetchurl, shaarli }:
+{ lib, env, stdenv, fetchurl, shaarli, config }:
 let
   varDir = "/var/lib/shaarli";
 in rec {
-  backups = {
-    rootDir = varDir;
-    remotes = [ "eriomem" "ovh" ];
-  };
   activationScript = ''
     install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \
-      ${varDir}/cache ${varDir}/pagecache ${varDir}/tmp ${varDir}/data \
-      ${varDir}/phpSessions
+      ${varDir}/cache ${varDir}/pagecache ${varDir}/tmp ${varDir}/data
     '';
-  webRoot = shaarli varDir;
+  webRoot = shaarli.override { inherit varDir; };
   apache = rec {
     user = "wwwrun";
     group = "wwwrun";
     modules =  [ "proxy_fcgi" "rewrite" "env" ];
-    webappName = "tools_shaarli";
-    root = "/run/current-system/webapps/${webappName}";
+    root = webRoot;
     vhostConf = socket: ''
       Alias /Shaarli "${root}"
 
-      Include /var/secrets/webapps/tools-shaarli
+      Include ${config.secrets.fullPaths."webapps/tools-shaarli"}
       <Location /Shaarli>
         Header set Access-Control-Allow-Origin "*"
         Header set Access-Control-Allow-Methods "GET, POST, PUT, DELETE, OPTIONS"
@@ -38,8 +32,30 @@ in rec {
       </Directory>
       '';
   };
-  keys = [{
-    dest = "webapps/tools-shaarli";
+  chatonsProperties = {
+    file.datetime = "2022-08-21T22:50:00";
+    service = {
+      name = "Shaarli";
+      description = "The personal, minimalist, super-fast, database free, bookmarking service - community repo";
+      website = "https://tools.immae.eu/Shaarli/";
+      logo = "https://tools.immae.eu/Shaarli/tpl/default/img/apple-touch-icon.png";
+      status.level = "OK";
+      status.description = "OK";
+      registration."" = ["MEMBER" "CLIENT"];
+      registration.load = "OPEN";
+      install.type = "PACKAGE";
+    };
+    software = {
+      name = "Shaarli";
+      website = "https://shaarli.readthedocs.io/";
+      license.url = "https://github.com/shaarli/Shaarli/blob/master/COPYING";
+      license.name = "GNU General Public License Version 3";
+      version = webRoot.version;
+      source.url = "https://github.com/shaarli/Shaarli";
+      modules = "ldap-connection-patch";
+    };
+  };
+  keys."webapps/tools-shaarli" = {
     user = apache.user;
     group = apache.group;
     permissions = "0400";
@@ -50,7 +66,7 @@ in rec {
       SetEnv SHAARLI_LDAP_BASE     "${env.ldap.base}"
       SetEnv SHAARLI_LDAP_FILTER   "${env.ldap.filter}"
       '';
-  }];
+  };
   phpFpm = rec {
     serviceDeps = [ "openldap.service" ];
     basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
@@ -64,7 +80,8 @@ in rec {
       # Needed to avoid clashes in browser cookies (same domain)
       "php_value[session.name]" = "ShaarliPHPSESSID";
       "php_admin_value[open_basedir]" = "${basedir}:/tmp";
-      "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
+      "php_admin_value[session.save_handler]" = "redis";
+      "php_admin_value[session.save_path]" = "'unix:///run/redis-php-sessions/redis.sock?persistent=1&prefix=Tools:Shaarli:'";
       "php_admin_value[upload_max_filesize]" = "200M";
       "php_admin_value[post_max_size]" = "200M";
     };