From ce44d1916876fd3496381d7c11bf9a0710aa32e4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 30 Jan 2021 00:59:25 +0100 Subject: [PATCH] make test vm use mysql db --- mod-seafile-server.nix | 34 +++++++++++++++++----------------- seafile-test.nix | 4 ++++ 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/mod-seafile-server.nix b/mod-seafile-server.nix index afed153..5eb9dea 100644 --- a/mod-seafile-server.nix +++ b/mod-seafile-server.nix @@ -62,24 +62,24 @@ in description = "Database name for Seahub web interface. Not required for sqlite."; }; passwordFile = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - The full path to a file that contains the database password. - Not required for sqlite. - ''; - }; - host = mkOption { - type = types.nullOr types.str; - default = "localhost"; - description = "Database host."; - }; - dbport = mkOption { - type = with types; nullOr (either int str); - default = 3306; - description = "Database port. Not required for sqlite."; - }; + type = types.nullOr types.str; + default = null; + description = '' + The full path to a file that contains the database password. + Not required for sqlite. + ''; }; + host = mkOption { + type = types.nullOr types.str; + default = "localhost"; + description = "Database host."; + }; + port = mkOption { + type = with types; nullOr (either int str); + default = 3306; + description = "Database port. Not required for sqlite."; + }; + }; user = mkOption { type = types.str; diff --git a/seafile-test.nix b/seafile-test.nix index 1bd1cb1..3dd349b 100644 --- a/seafile-test.nix +++ b/seafile-test.nix @@ -26,6 +26,10 @@ enable = true; #autorun = false; domainName = "seaf.local"; + db = { + type = "mysql"; + passwordFile = toString (pkgs.writeText "testPW" "lol"); + }; }; }