aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-06-13 02:07:52 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-06-13 02:08:03 +0200
commit8f1d6cb579ec203ce86f8af30bea729dbb0a9f7f (patch)
treeded4d754f324f59688345b3fd19459b3bb8ad70e /modules/private/websites
parent8b2f048bed8d081f18d9ba7bc1cce16c28670217 (diff)
downloadNix-8f1d6cb579ec203ce86f8af30bea729dbb0a9f7f.tar.gz
Nix-8f1d6cb579ec203ce86f8af30bea729dbb0a9f7f.tar.zst
Nix-8f1d6cb579ec203ce86f8af30bea729dbb0a9f7f.zip
Fix Adminer mysql connection for PAM authentication
Diffstat (limited to 'modules/private/websites')
-rw-r--r--modules/private/websites/immae/history/_posts/2020-06-13-fix-adminer.md10
-rw-r--r--modules/private/websites/tools/tools/adminer.nix4
2 files changed, 12 insertions, 2 deletions
diff --git a/modules/private/websites/immae/history/_posts/2020-06-13-fix-adminer.md b/modules/private/websites/immae/history/_posts/2020-06-13-fix-adminer.md
new file mode 100644
index 0000000..af6edf1
--- /dev/null
+++ b/modules/private/websites/immae/history/_posts/2020-06-13-fix-adminer.md
@@ -0,0 +1,10 @@
1---
2title: "Réparation d’Adminer"
3category: Fix
4tags: [BDD]
5date: 2020-06-13
6---
7Depuis la mise à jour de NixOS à 19.09, Adminer (et plus généralement
8php) n’était plus capable de se connecter à mysql avec le mécanisme PAM.
9L’extension mysqli a été patchée pour permettre une telle utilisation,
10permettant d’utiliser à nouveau Adminer comme client.
diff --git a/modules/private/websites/tools/tools/adminer.nix b/modules/private/websites/tools/tools/adminer.nix
index 61fd37c..af03550 100644
--- a/modules/private/websites/tools/tools/adminer.nix
+++ b/modules/private/websites/tools/tools/adminer.nix
@@ -1,4 +1,4 @@
1{ adminer, php74, forcePhpSocket ? null }: 1{ adminer, php74, php74base, myPhpPackages, lib, forcePhpSocket ? null }:
2rec { 2rec {
3 activationScript = { 3 activationScript = {
4 deps = [ "httpd" ]; 4 deps = [ "httpd" ];
@@ -10,7 +10,7 @@ rec {
10 phpFpm = rec { 10 phpFpm = rec {
11 user = apache.user; 11 user = apache.user;
12 group = apache.group; 12 group = apache.group;
13 phpPackage = php74; 13 phpPackage = php74base.withExtensions (e: (lib.remove e.mysqli php74.enabledExtensions) ++ [myPhpPackages.mysqli_pam]);
14 settings = { 14 settings = {
15 "listen.owner" = apache.user; 15 "listen.owner" = apache.user;
16 "listen.group" = apache.group; 16 "listen.group" = apache.group;