Allow plain mecanism for users login

[perso/Immae/Config/Nix.git] / systems / eldiron / base.nix

diff --git a/systems/eldiron/base.nix b/systems/eldiron/base.nix
index 1f894a564d31b19cf096b133fa7c44e6c5c7b418..a77a438e455d9bbe7c207067e4915f861ef6db2b 100644 (file)
--- a/systems/eldiron/base.nix
+++ b/systems/eldiron/base.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, php, name, secrets, ... }:
+{ config, pkgs, lib, ports, name, secrets, ... }:
 {
   # ssh-keyscan eldiron | nix-shell -p ssh-to-age --run ssh-to-age
   secrets.ageKeys = [ "age1dxr5lhvtnjssfaqpnf6qx80h8gfwkxg3tdf35m6n9wljmk7wadfs3kmahj" ];
@@ -28,9 +28,7 @@
     "nodejs-16.20.2" # for landing page building
   ];
 
-  nixpkgs.overlays = [
-    php.overlays.php
-  ];
+  nixpkgs.overlays = builtins.attrValues ports.overlays;
   powerManagement.cpuFreqGovernor = "powersave";
 
   security.acme.certs."${name}".postRun = builtins.concatStringsSep "\n" [
@@ -177,7 +175,7 @@
         table = ldap_users
         user_column = login
         pw_type = function
-        auth_query = SELECT (mechanism = 'SSHA' AND password = encode(digest( %p || salt, 'sha1'), 'hex')) FROM ldap_users WHERE login = %u OR login || '@' || realm = %u
+        auth_query = SELECT ((mechanism = 'SSHA' AND password = encode(digest( %p || salt, 'sha1'), 'hex')) OR (mechanism = 'PLAIN' AND password = %p)) FROM ldap_users WHERE login = %u OR login || '@' || realm = %u
         #pwd_query = WITH newsalt as (select gen_random_bytes(4)) UPDATE ldap_users SET password = encode(digest( %p || (SELECT * FROM newsalt), 'sha1'), 'hex'), salt = (SELECT * FROM newsalt), mechanism = 'SSHA' WHERE login = %u OR login || '@' || realm = %u
       '';
     };