From 1a64deeb894dc95e2645a75771732c6cc53a79ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Wed, 4 Oct 2023 01:35:06 +0200
Subject: Squash changes containing private information

There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository
---
 modules/private/websites/tools/tools/shaarli.nix | 66 ------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 modules/private/websites/tools/tools/shaarli.nix

(limited to '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
deleted file mode 100644
index d128465..0000000
--- a/modules/private/websites/tools/tools/shaarli.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ lib, env, stdenv, fetchurl, shaarli, config }:
-let
-  varDir = "/var/lib/shaarli";
-in rec {
-  activationScript = ''
-    install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \
-      ${varDir}/cache ${varDir}/pagecache ${varDir}/tmp ${varDir}/data \
-      ${varDir}/phpSessions
-    '';
-  webRoot = shaarli varDir;
-  apache = rec {
-    user = "wwwrun";
-    group = "wwwrun";
-    modules =  [ "proxy_fcgi" "rewrite" "env" ];
-    root = webRoot;
-    vhostConf = socket: ''
-      Alias /Shaarli "${root}"
-
-      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"
-        Header set Access-Control-Allow-Headers "Origin, X-Requested-With, Content-Type, Accept, Authorization, Client-Security-Token, Accept-Encoding"
-      </Location>
-      <Directory "${root}">
-        DirectoryIndex index.php index.htm index.html
-        Options Indexes FollowSymLinks MultiViews Includes
-        AllowOverride All
-        Require all granted
-        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:${socket}|fcgi://localhost"
-        </FilesMatch>
-      </Directory>
-      '';
-  };
-  keys."webapps/tools-shaarli" = {
-    user = apache.user;
-    group = apache.group;
-    permissions = "0400";
-    text = ''
-      SetEnv SHAARLI_LDAP_PASSWORD "${env.ldap.password}"
-      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.filter}"
-      '';
-  };
-  phpFpm = rec {
-    serviceDeps = [ "openldap.service" ];
-    basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
-    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";
-      "php_admin_value[upload_max_filesize]" = "200M";
-      "php_admin_value[post_max_size]" = "200M";
-    };
-  };
-}
-- 
cgit v1.2.3