diff options
author | Izorkin <izorkin@elven.pw> | 2020-05-05 10:22:52 +0300 |
---|---|---|
committer | Izorkin <izorkin@elven.pw> | 2020-05-14 17:29:40 +0300 |
commit | b8c8e810aa330798cc458f412fd6282632e80073 (patch) | |
tree | 52a3f13cb3632b960eb11de55c8acb7cfb53da93 /nixos/modules | |
parent | 6ac9a9fcb48374362907039354533518788cf480 (diff) | |
download | nixlib-b8c8e810aa330798cc458f412fd6282632e80073.tar nixlib-b8c8e810aa330798cc458f412fd6282632e80073.tar.gz nixlib-b8c8e810aa330798cc458f412fd6282632e80073.tar.bz2 nixlib-b8c8e810aa330798cc458f412fd6282632e80073.tar.lz nixlib-b8c8e810aa330798cc458f412fd6282632e80073.tar.xz nixlib-b8c8e810aa330798cc458f412fd6282632e80073.tar.zst nixlib-b8c8e810aa330798cc458f412fd6282632e80073.zip |
nixos/mysql: disable load pluginx auth_socket in mariadb
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/databases/mysql.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index f9e657f57742..71b7afa3d39c 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -87,7 +87,6 @@ in datadir = /var/lib/mysql bind-address = 127.0.0.1 port = 3336 - plugin-load-add = auth_socket.so !includedir /etc/mysql/conf.d/ '''; @@ -315,7 +314,6 @@ in datadir = cfg.dataDir; bind-address = mkIf (cfg.bind != null) cfg.bind; port = cfg.port; - plugin-load-add = optional (cfg.ensureUsers != []) "auth_socket.so"; } (mkIf (cfg.replication.role == "master" || cfg.replication.role == "slave") { log-bin = "mysql-bin-${toString cfg.replication.serverId}"; @@ -323,6 +321,9 @@ in relay-log = "mysql-relay-bin"; server-id = cfg.replication.serverId; }) + (mkIf (!isMariaDB) { + plugin-load-add = optional (cfg.ensureUsers != []) "auth_socket.so"; + }) ]; users.users.mysql = { |