Unverified Commit e9eb7be1 authored by Matthew Croughan's avatar Matthew Croughan Committed by GitHub
Browse files

nixos/scion: upgrade to 0.12 and fix module accordingly (#417777)

parents cd7896d2 c3af3e7a

nixos/modules/services/networking/scion/scion-control.nix

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ let 
    general = {

      id = "cs";

      config_dir = "/etc/scion";

      reconnect_to_dispatcher = true;

    };

    beacon_db = {

      connection = "${connectionDir}/scion-control/control.beacon.db";

nixos/modules/services/networking/scion/scion-daemon.nix

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ let 
    general = {

      id = "sd";

      config_dir = "/etc/scion";

      reconnect_to_dispatcher = true;

    };

    path_db = {

      connection = "${connectionDir}/scion-daemon/sd.path.db";

nixos/modules/services/networking/scion/scion-dispatcher.nix

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ let 
  defaultConfig = {

    dispatcher = {

      id = "dispatcher";

      socket_file_mode = "0770";

      application_socket = "/dev/shm/dispatcher/default.sock";

      local_udp_forwarding = true;

    };

    log.console = {

      level = "info";

nixos/tests/scion/freestanding-deployment/topology1.json

+1 −0
Original line number Diff line number Diff line 
{

  "dispatched_ports": "31000-32767",

  "attributes": [

    "core"

  ],

nixos/tests/scion/freestanding-deployment/topology2.json

+1 −0
Original line number Diff line number Diff line 
{

  "dispatched_ports": "31000-32767",

  "attributes": [

    "core"

  ],