diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2019-02-25 16:01:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-25 16:01:42 +0100 |
| commit | 0a63b6528b067661f66436a598a5f27aab78b216 (patch) | |
| tree | 9dd9e0e18b12d13d93c4fee9d28953417c8ae56a | |
| parent | 64c60a813d22c54b0b171a0c558719b4a3d207b1 (diff) | |
| parent | c0829a0859b33f1b3ff264bece9955730d7edf15 (diff) | |
| download | nixlib-0a63b6528b067661f66436a598a5f27aab78b216.tar nixlib-0a63b6528b067661f66436a598a5f27aab78b216.tar.gz nixlib-0a63b6528b067661f66436a598a5f27aab78b216.tar.bz2 nixlib-0a63b6528b067661f66436a598a5f27aab78b216.tar.lz nixlib-0a63b6528b067661f66436a598a5f27aab78b216.tar.xz nixlib-0a63b6528b067661f66436a598a5f27aab78b216.tar.zst nixlib-0a63b6528b067661f66436a598a5f27aab78b216.zip | |
Merge pull request #55547 from delroth/fix-warnings
Fix 3 warnings in nixos/tests
| -rw-r--r-- | nixos/tests/gitea.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/ndppd.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/rspamd.nix | 16 |
3 files changed, 15 insertions, 6 deletions
diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index 28e6479e9cbe..d43efc3687a7 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -45,7 +45,7 @@ with pkgs.lib; { services.gitea.enable = true; services.gitea.database.type = "postgres"; - services.gitea.database.password = "secret"; + services.gitea.database.passwordFile = pkgs.writeText "db-password" "secret"; }; testScript = '' diff --git a/nixos/tests/ndppd.nix b/nixos/tests/ndppd.nix index 9f24eb6d9d45..c53ff93a91f9 100644 --- a/nixos/tests/ndppd.nix +++ b/nixos/tests/ndppd.nix @@ -37,8 +37,7 @@ import ./make-test.nix ({ pkgs, lib, ...} : { }; services.ndppd = { enable = true; - interface = "eth1"; - network = "fd42::/112"; + proxies."eth1".rules."fd42::/112" = {}; }; containers.client = { autoStart = true; diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix index 396cd5b67d81..0cc94728f80a 100644 --- a/nixos/tests/rspamd.nix +++ b/nixos/tests/rspamd.nix @@ -52,8 +52,18 @@ in machine = { services.rspamd = { enable = true; - bindSocket = [ "/run/rspamd.sock mode=0600 user=root group=root" ]; - bindUISocket = [ "/run/rspamd-worker.sock mode=0666 user=root group=root" ]; + workers.normal.bindSockets = [{ + socket = "/run/rspamd.sock"; + mode = "0600"; + owner = "root"; + group = "root"; + }]; + workers.controller.bindSockets = [{ + socket = "/run/rspamd-worker.sock"; + mode = "0666"; + owner = "root"; + group = "root"; + }]; }; }; @@ -235,7 +245,7 @@ in services.rspamd = { enable = true; postfix.enable = true; - workers.rspamd_proxy.type = "proxy"; + workers.rspamd_proxy.type = "rspamd_proxy"; }; }; testScript = '' |