From da2a336a3c79c6cd302fde4801c5d1cbc31c9f19 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 28 Feb 2014 16:16:57 +0100 Subject: Remove tabs --- nixos/tests/mysql-replication.nix | 28 ++++++++++++++-------------- nixos/tests/mysql.nix | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix index a68d21c82b41..945321895864 100644 --- a/nixos/tests/mysql-replication.nix +++ b/nixos/tests/mysql-replication.nix @@ -12,11 +12,11 @@ in { services.mysql.enable = true; services.mysql.package = pkgs.mysql; - services.mysql.replication.role = "master"; - services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; - services.mysql.initialScript = pkgs.writeText "initmysql" + services.mysql.replication.role = "master"; + services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + services.mysql.initialScript = pkgs.writeText "initmysql" '' - create user '${replicateUser}'@'%' identified by '${replicatePassword}'; + create user '${replicateUser}'@'%' identified by '${replicatePassword}'; grant replication slave on *.* to '${replicateUser}'@'%'; ''; }; @@ -26,11 +26,11 @@ in { services.mysql.enable = true; - services.mysql.replication.role = "slave"; - services.mysql.replication.serverId = 2; - services.mysql.replication.masterHost = nodes.master.config.networking.hostName; - services.mysql.replication.masterUser = replicateUser; - services.mysql.replication.masterPassword = replicatePassword; + services.mysql.replication.role = "slave"; + services.mysql.replication.serverId = 2; + services.mysql.replication.masterHost = nodes.master.config.networking.hostName; + services.mysql.replication.masterUser = replicateUser; + services.mysql.replication.masterPassword = replicatePassword; }; slave2 = @@ -38,11 +38,11 @@ in { services.mysql.enable = true; - services.mysql.replication.role = "slave"; - services.mysql.replication.serverId = 3; - services.mysql.replication.masterHost = nodes.master.config.networking.hostName; - services.mysql.replication.masterUser = replicateUser; - services.mysql.replication.masterPassword = replicatePassword; + services.mysql.replication.role = "slave"; + services.mysql.replication.serverId = 3; + services.mysql.replication.masterHost = nodes.master.config.networking.hostName; + services.mysql.replication.masterUser = replicateUser; + services.mysql.replication.masterPassword = replicatePassword; }; }; diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index abdd39092216..bceeb8beabc2 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -7,8 +7,8 @@ { services.mysql.enable = true; - services.mysql.replication.role = "master"; - services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + services.mysql.replication.role = "master"; + services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; services.mysql.package = pkgs.mysql; }; }; -- cgit 1.4.1