mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-27 08:04:14 +00:00
4f0dadbf38
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build a08b3a4d19.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
135 lines
3.4 KiB
Nix
135 lines
3.4 KiB
Nix
let
|
|
carolKey = "2d2a338b46f8e4a8c462f0c385b481292a05f678e19a2b82755258cf0f0af7e2";
|
|
carolPubKey = "n932l3pjvmhtxxcdrqq2qpw5zc58f01vvjx01h4dtd1bb0nnu2h0.k";
|
|
carolPassword = "678287829ce4c67bc8b227e56d94422ee1b85fa11618157b2f591de6c6322b52";
|
|
|
|
basicConfig =
|
|
{ ... }:
|
|
{
|
|
services.cjdns.enable = true;
|
|
|
|
# Turning off DHCP isn't very realistic but makes
|
|
# the sequence of address assignment less stochastic.
|
|
networking.useDHCP = false;
|
|
|
|
# CJDNS output is incompatible with the XML log.
|
|
systemd.services.cjdns.serviceConfig.StandardOutput = "null";
|
|
};
|
|
|
|
in
|
|
|
|
import ./make-test-python.nix (
|
|
{ pkgs, ... }:
|
|
{
|
|
name = "cjdns";
|
|
meta = with pkgs.lib.maintainers; {
|
|
maintainers = [ ehmry ];
|
|
};
|
|
|
|
nodes = {
|
|
# Alice finds peers over over ETHInterface.
|
|
alice =
|
|
{ ... }:
|
|
{
|
|
imports = [ basicConfig ];
|
|
|
|
services.cjdns.ETHInterface.bind = "eth1";
|
|
|
|
services.httpd.enable = true;
|
|
services.httpd.adminAddr = "foo@example.org";
|
|
networking.firewall.allowedTCPPorts = [ 80 ];
|
|
};
|
|
|
|
# Bob explicitly connects to Carol over UDPInterface.
|
|
bob =
|
|
{ ... }:
|
|
|
|
{
|
|
imports = [ basicConfig ];
|
|
|
|
networking.interfaces.eth1.ipv4.addresses = [
|
|
{
|
|
address = "192.168.0.2";
|
|
prefixLength = 24;
|
|
}
|
|
];
|
|
|
|
services.cjdns = {
|
|
UDPInterface = {
|
|
bind = "0.0.0.0:1024";
|
|
connectTo."192.168.0.1:1024" = {
|
|
password = carolPassword;
|
|
publicKey = carolPubKey;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
# Carol listens on ETHInterface and UDPInterface,
|
|
# but knows neither Alice or Bob.
|
|
carol =
|
|
{ ... }:
|
|
{
|
|
imports = [ basicConfig ];
|
|
|
|
environment.etc."cjdns.keys".text = ''
|
|
CJDNS_PRIVATE_KEY=${carolKey}
|
|
CJDNS_ADMIN_PASSWORD=FOOBAR
|
|
'';
|
|
|
|
networking.interfaces.eth1.ipv4.addresses = [
|
|
{
|
|
address = "192.168.0.1";
|
|
prefixLength = 24;
|
|
}
|
|
];
|
|
|
|
services.cjdns = {
|
|
authorizedPasswords = [ carolPassword ];
|
|
ETHInterface.bind = "eth1";
|
|
UDPInterface.bind = "192.168.0.1:1024";
|
|
};
|
|
networking.firewall.allowedUDPPorts = [ 1024 ];
|
|
};
|
|
|
|
};
|
|
|
|
testScript = ''
|
|
import re
|
|
|
|
start_all()
|
|
|
|
alice.wait_for_unit("cjdns.service")
|
|
bob.wait_for_unit("cjdns.service")
|
|
carol.wait_for_unit("cjdns.service")
|
|
|
|
|
|
def cjdns_ip(machine):
|
|
res = machine.succeed("ip -o -6 addr show dev tun0")
|
|
ip = re.split("\s+|/", res)[3]
|
|
machine.log("has ip {}".format(ip))
|
|
return ip
|
|
|
|
|
|
alice_ip6 = cjdns_ip(alice)
|
|
bob_ip6 = cjdns_ip(bob)
|
|
carol_ip6 = cjdns_ip(carol)
|
|
|
|
# ping a few times each to let the routing table establish itself
|
|
|
|
alice.succeed("ping -c 4 {}".format(carol_ip6))
|
|
bob.succeed("ping -c 4 {}".format(carol_ip6))
|
|
|
|
carol.succeed("ping -c 4 {}".format(alice_ip6))
|
|
carol.succeed("ping -c 4 {}".format(bob_ip6))
|
|
|
|
alice.succeed("ping -c 4 {}".format(bob_ip6))
|
|
bob.succeed("ping -c 4 {}".format(alice_ip6))
|
|
|
|
alice.wait_for_unit("httpd.service")
|
|
|
|
bob.succeed("curl --fail -g http://[{}]".format(alice_ip6))
|
|
'';
|
|
}
|
|
)
|