diff options
author | rnhmjoj <rnhmjoj@inventati.org> | 2021-09-22 11:49:11 +0200 |
---|---|---|
committer | rnhmjoj <rnhmjoj@inventati.org> | 2021-09-22 11:49:11 +0200 |
commit | 196621010c23b201735881a8512abf6a1999d037 (patch) | |
tree | 6639a633f7040f1cfea6a695d0acbaa295aa451d | |
parent | 113cc7b13614a6228dc5b4edab117a162e05f68a (diff) | |
download | nixpkgs-196621010c23b201735881a8512abf6a1999d037.tar nixpkgs-196621010c23b201735881a8512abf6a1999d037.tar.gz nixpkgs-196621010c23b201735881a8512abf6a1999d037.tar.bz2 nixpkgs-196621010c23b201735881a8512abf6a1999d037.tar.lz nixpkgs-196621010c23b201735881a8512abf6a1999d037.tar.xz nixpkgs-196621010c23b201735881a8512abf6a1999d037.tar.zst nixpkgs-196621010c23b201735881a8512abf6a1999d037.zip |
nixos/tests/mariadb-galera-rsync: fix nogroup
This fixes the evaluation after for #133166.
-rw-r--r-- | nixos/tests/mysql/mariadb-galera-rsync.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/nixos/tests/mysql/mariadb-galera-rsync.nix b/nixos/tests/mysql/mariadb-galera-rsync.nix index 709a8b5085c..701e01e8871 100644 --- a/nixos/tests/mysql/mariadb-galera-rsync.nix +++ b/nixos/tests/mysql/mariadb-galera-rsync.nix @@ -4,6 +4,16 @@ let mysqlenv-common = pkgs.buildEnv { name = "mysql-path-env-common"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ bash gawk gnutar inetutils which ]; }; mysqlenv-rsync = pkgs.buildEnv { name = "mysql-path-env-rsync"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ lsof procps rsync stunnel ]; }; + # Common user configuration + users = { ... }: + { + users.users.testuser = { + isSystemUser = true; + group = "testusers"; + }; + users.groups.testusers = { }; + }; + in { name = "mariadb-galera-rsync"; meta = with pkgs.lib.maintainers; { @@ -17,6 +27,7 @@ in { galera_04 = { pkgs, ... }: { + imports = [ users ]; networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -31,7 +42,6 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-rsync ]; }; @@ -70,6 +80,7 @@ in { galera_05 = { pkgs, ... }: { + imports = [ users ]; networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -84,7 +95,6 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-rsync ]; }; @@ -116,6 +126,7 @@ in { galera_06 = { pkgs, ... }: { + imports = [ users ]; networking = { interfaces.eth1 = { ipv4.addresses = [ @@ -130,7 +141,6 @@ in { firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; firewall.allowedUDPPorts = [ 4567 ]; }; - users.users.testuser = { isSystemUser = true; }; systemd.services.mysql = with pkgs; { path = [ mysqlenv-common mysqlenv-rsync ]; }; |