diff options
author | Pierre Bourdon <delroth@gmail.com> | 2019-02-11 02:59:55 +0100 |
---|---|---|
committer | Pierre Bourdon <delroth@gmail.com> | 2019-02-11 02:59:55 +0100 |
commit | 4b959cd354088557a98691be8bf27e189fa12aa9 (patch) | |
tree | 187a6c4933d5bf6baaaa6f5745c041a87a3fb13e | |
parent | 3e814327b15dec39d5e0b1f51b0c402331ee3fc2 (diff) | |
download | nixlib-4b959cd354088557a98691be8bf27e189fa12aa9.tar nixlib-4b959cd354088557a98691be8bf27e189fa12aa9.tar.gz nixlib-4b959cd354088557a98691be8bf27e189fa12aa9.tar.bz2 nixlib-4b959cd354088557a98691be8bf27e189fa12aa9.tar.lz nixlib-4b959cd354088557a98691be8bf27e189fa12aa9.tar.xz nixlib-4b959cd354088557a98691be8bf27e189fa12aa9.tar.zst nixlib-4b959cd354088557a98691be8bf27e189fa12aa9.zip |
nixos/tests/rspamd: fix eval warnings
trace: warning: The option `services.rspamd.bindUISocket' defined in `<unknown-file>' has been renamed to `services.rspamd.workers.controller.bindSockets'. trace: warning: The option `services.rspamd.bindSocket' defined in `<unknown-file>' has been renamed to `services.rspamd.workers.normal.bindSockets'. trace: warning: The option `services.rspamd.workers.”rspamd_proxy".type` defined in `<unknown-file>' has enum value `proxy` which has been renamed to `rspamd_proxy`
-rw-r--r-- | nixos/tests/rspamd.nix | 16 |
1 files changed, 13 insertions, 3 deletions
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 = '' |