Merge pull request #55547 from delroth/fix-warnings

Fix 3 warnings in nixos/tests
This commit is contained in:
xeji 2019-02-25 16:01:42 +01:00 committed by GitHub
commit 0a63b6528b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 6 deletions

View File

@ -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 = ''

View File

@ -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;

View File

@ -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 = ''