Upgrade nixos

[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 2e89a473837a24918eb53e8301df250681a4576f..950d2962fa2f95b4bee2ad48a634ca27acf72daa 100644 (file)
--- a/modules/private/websites/tools/tools/shaarli.nix
+++ b/modules/private/websites/tools/tools/shaarli.nix
@@ -2,6 +2,9 @@
 let
   varDir = "/var/lib/shaarli";
 in rec {
+  backups = {
+    rootDir = varDir;
+  };
   activationScript = ''
     install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \
       ${varDir}/cache ${varDir}/pagecache ${varDir}/tmp ${varDir}/data \
@@ -14,7 +17,7 @@ in rec {
     modules =  [ "proxy_fcgi" "rewrite" "env" ];
     webappName = "tools_shaarli";
     root = "/run/current-system/webapps/${webappName}";
-    vhostConf = ''
+    vhostConf = socket: ''
       Alias /Shaarli "${root}"
 
       Include /var/secrets/webapps/tools-shaarli
@@ -24,7 +27,7 @@ in rec {
         AllowOverride All
         Require all granted
         <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+          SetHandler "proxy:unix:${socket}|fcgi://localhost"
         </FilesMatch>
       </Directory>
       '';
@@ -39,27 +42,23 @@ in rec {
       SetEnv SHAARLI_LDAP_DN       "${env.ldap.dn}"
       SetEnv SHAARLI_LDAP_HOST     "ldaps://${env.ldap.host}"
       SetEnv SHAARLI_LDAP_BASE     "${env.ldap.base}"
-      SetEnv SHAARLI_LDAP_FILTER   "${env.ldap.search}"
+      SetEnv SHAARLI_LDAP_FILTER   "${env.ldap.filter}"
       '';
   }];
   phpFpm = rec {
     serviceDeps = [ "openldap.service" ];
     basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
-    socket = "/var/run/phpfpm/shaarli.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] = ShaarliPHPSESSID
-        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]" = "ShaarliPHPSESSID";
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp";
+      "php_admin_value[session.save_path]" = "${varDir}/phpSessions";
+    };
   };
 }