commit 7476494b3b16a4861035ef4a876d47050b7f1505 · pyrox.dev/nixpkgs

+2 -2

nixos/modules/services/networking/cjdns.nix

···

       49
       49
        
               k: v:

     

       50
       50
        
               lib.optionalString (

     

       51
       51
        
                 v.hostname != ""

     

       52
       52
       -
               ) "echo $(${pkgs.cjdns}/bin/publictoip6 ${v.publicKey}) ${v.hostname}"

     

       52
       52
       +
               ) "echo $(${pkgs.cjdns}/bin/cjdnstool util key2ip6 ${v.publicKey}) ${v.hostname}"

     

       53
       53
        
             ) (cfg.ETHInterface.connectTo // cfg.UDPInterface.connectTo)

     

       54
       54
        
           )}

     

       55
       55
        
         '';

     
···

       268
       268
        
       

     

       269
       269
        
               if [ -z "$CJDNS_PRIVATE_KEY" ]; then

     

       270
       270
        
                   shopt -s lastpipe

     

       271
       271
       -
                   ${pkg}/bin/makekeys | { read private ipv6 public; }

     

       271
       271
       +
                   ${pkg}/bin/cjdnstool util keygen | { read private ipv6 public; }

     

       272
       272
        
       

     

       273
       273
        
                   install -m 600 <(echo "CJDNS_PRIVATE_KEY=$private") /etc/cjdns.keys

     

       274
       274
        
                   install -m 444 <(echo -e "CJDNS_IPV6=$ipv6\nCJDNS_PUBLIC_KEY=$public") /etc/cjdns.public

+7 -7

nixos/tests/cjdns.nix

···

       105
       105
        
       

     

       106
       106
        
           def cjdns_ip(machine):

     

       107
       107
        
               res = machine.succeed("ip -o -6 addr show dev tun0")

     

       108
       108
       -
               ip = re.split("\s+|/", res)[3]

     

       108
       108
       +
               ip = re.split("\\s+|/", res)[3]

     

       109
       109
        
               machine.log("has ip {}".format(ip))

     

       110
       110
        
               return ip

     

       111
       111
        
       

     
···

       116
       116
        
       

     

       117
       117
        
           # ping a few times each to let the routing table establish itself

     

       118
       118
        
       

     

       119
       119
       -
           alice.succeed("ping -c 4 {}".format(carol_ip6))

     

       120
       120
       -
           bob.succeed("ping -c 4 {}".format(carol_ip6))

     

       119
       119
       +
           alice.wait_until_succeeds("ping -c 4 {}".format(carol_ip6))

     

       120
       120
       +
           bob.wait_until_succeeds("ping -c 4 {}".format(carol_ip6))

     

       121
       121
        
       

     

       122
       122
       -
           carol.succeed("ping -c 4 {}".format(alice_ip6))

     

       123
       123
       -
           carol.succeed("ping -c 4 {}".format(bob_ip6))

     

       122
       122
       +
           carol.wait_until_succeeds("ping -c 4 {}".format(alice_ip6))

     

       123
       123
       +
           carol.wait_until_succeeds("ping -c 4 {}".format(bob_ip6))

     

       124
       124
        
       

     

       125
       125
       -
           alice.succeed("ping -c 4 {}".format(bob_ip6))

     

       126
       126
       -
           bob.succeed("ping -c 4 {}".format(alice_ip6))

     

       125
       125
       +
           alice.wait_until_succeeds("ping -c 4 {}".format(bob_ip6))

     

       126
       126
       +
           bob.wait_until_succeeds("ping -c 4 {}".format(alice_ip6))

     

       127
       127
        
       

     

       128
       128
        
           alice.wait_for_unit("httpd.service")

     

       129
       129