lol

nixos/scion: changes for 0.12

These are the necessary changes for updating to 0.12, which supports dispatcherless operation by foregoing the dispatcher's unix socket in favour of UDP

+6 -4
-1
nixos/modules/services/networking/scion/scion-control.nix
··· 16 16 general = { 17 17 id = "cs"; 18 18 config_dir = "/etc/scion"; 19 - reconnect_to_dispatcher = true; 20 19 }; 21 20 beacon_db = { 22 21 connection = "${connectionDir}/scion-control/control.beacon.db";
-1
nixos/modules/services/networking/scion/scion-daemon.nix
··· 16 16 general = { 17 17 id = "sd"; 18 18 config_dir = "/etc/scion"; 19 - reconnect_to_dispatcher = true; 20 19 }; 21 20 path_db = { 22 21 connection = "${connectionDir}/scion-daemon/sd.path.db";
+1 -2
nixos/modules/services/networking/scion/scion-dispatcher.nix
··· 14 14 defaultConfig = { 15 15 dispatcher = { 16 16 id = "dispatcher"; 17 - socket_file_mode = "0770"; 18 - application_socket = "/dev/shm/dispatcher/default.sock"; 17 + local_udp_forwarding = true; 19 18 }; 20 19 log.console = { 21 20 level = "info";
+1
nixos/tests/scion/freestanding-deployment/topology1.json
··· 1 1 { 2 + "dispatched_ports": "31000-32767", 2 3 "attributes": [ 3 4 "core" 4 5 ],
+1
nixos/tests/scion/freestanding-deployment/topology2.json
··· 1 1 { 2 + "dispatched_ports": "31000-32767", 2 3 "attributes": [ 3 4 "core" 4 5 ],
+1
nixos/tests/scion/freestanding-deployment/topology3.json
··· 1 1 { 2 + "dispatched_ports": "31000-32767", 2 3 "attributes": [ 3 4 "core" 4 5 ],
+1
nixos/tests/scion/freestanding-deployment/topology4.json
··· 1 1 { 2 + "dispatched_ports": "31000-32767", 2 3 "attributes": [], 3 4 "isd_as": "42-ffaa:1:4", 4 5 "mtu": 1472,
+1
nixos/tests/scion/freestanding-deployment/topology5.json
··· 1 1 { 2 + "dispatched_ports": "31000-32767", 2 3 "attributes": [], 3 4 "isd_as": "42-ffaa:1:5", 4 5 "mtu": 1472,