diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2018-02-19 14:12:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-19 14:12:58 +0000 |
commit | 10b3f7d3564d4ef1deeaed7ece130588d5ba1905 (patch) | |
tree | 5c551c6f5aa44f598d1bdc00ba23006fb65e13d4 /nixos/tests/cjdns.nix | |
parent | e37b756b91a0713cefdf8a53d78feadcd00a40fc (diff) | |
parent | 06517547519737cd4c719b0c8ef78d046816f57e (diff) | |
download | nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.tar nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.tar.gz nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.tar.bz2 nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.tar.lz nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.tar.xz nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.tar.zst nixlib-10b3f7d3564d4ef1deeaed7ece130588d5ba1905.zip |
Merge pull request #27688 from rnhmjoj/routes
nixos/networking-interfaces: make static routes configurable
Diffstat (limited to 'nixos/tests/cjdns.nix')
-rw-r--r-- | nixos/tests/cjdns.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index 466663799241..4d3b58abc6e5 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -12,7 +12,6 @@ let # the sequence of address assignment less stochastic. networking.useDHCP = false; - networking.interfaces.eth1.prefixLength = 24; # CJDNS output is incompatible with the XML log. systemd.services.cjdns.serviceConfig.StandardOutput = "null"; #networking.firewall.enable = true; @@ -49,7 +48,9 @@ import ./make-test.nix ({ pkgs, ...} : { { imports = [ basicConfig ]; - networking.interfaces.eth1.ipAddress = "192.168.0.2"; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.2"; prefixLength = 24; } + ]; services.cjdns = { UDPInterface = @@ -76,7 +77,9 @@ import ./make-test.nix ({ pkgs, ...} : { CJDNS_ADMIN_PASSWORD=FOOBAR ''; - networking.interfaces.eth1.ipAddress = "192.168.0.1"; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.1"; prefixLength = 24; } + ]; services.cjdns = { authorizedPasswords = [ carolPassword ]; |