commit c53e5201f49fa6f016b857f596ccbb0737ed7a1e · pyrox.dev/nixpkgs

+6 -4

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

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       +
         globalCfg = config.services.scion;

     

       6
       7
        
         cfg = config.services.scion.scion-control;

     

       7
       8
        
         toml = pkgs.formats.toml { };

     

       9
       9
       +
         connectionDir = if globalCfg.stateless then "/run" else "/var/lib";

     

       8
       10
        
         defaultConfig = {

     

       9
       11
        
           general = {

     

       10
       12
        
             id = "cs";

     
···

       12
       14
        
             reconnect_to_dispatcher = true;

     

       13
       15
        
           };

     

       14
       16
        
           beacon_db = {

     

       15
       15
       -
             connection = "/run/scion-control/control.beacon.db";

     

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

     

       16
       18
        
           };

     

       17
       19
        
           path_db = {

     

       18
       18
       -
             connection = "/run/scion-control/control.path.db";

     

       20
       20
       +
             connection = "${connectionDir}/scion-control/control.path.db";

     

       19
       21
        
           };

     

       20
       22
        
           trust_db = {

     

       21
       21
       -
             connection = "/run/scion-control/control.trust.db";

     

       23
       23
       +
             connection = "${connectionDir}/scion-control/control.trust.db";

     

       22
       24
        
           };

     

       23
       25
        
           log.console = {

     

       24
       26
        
             level = "info";

     
···

       62
       64
        
               DynamicUser = true;

     

       63
       65
        
               Restart = "on-failure";

     

       64
       66
        
               BindPaths = [ "/dev/shm:/run/shm" ];

     

       65
       65
       -
               RuntimeDirectory = "scion-control";

     

       67
       67
       +
               ${if globalCfg.stateless then "RuntimeDirectory" else "StateDirectory"} = "scion-control";

     

       66
       68
        
             };

     

       67
       69
        
           };

     

       68
       70
        
         };

+5 -3

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

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       +
         globalCfg = config.services.scion;

     

       6
       7
        
         cfg = config.services.scion.scion-daemon;

     

       7
       8
        
         toml = pkgs.formats.toml { };

     

       9
       9
       +
         connectionDir = if globalCfg.stateless then "/run" else "/var/lib";

     

       8
       10
        
         defaultConfig = {

     

       9
       11
        
           general = {

     

       10
       12
        
             id = "sd";

     
···

       12
       14
        
             reconnect_to_dispatcher = true;

     

       13
       15
        
           };

     

       14
       16
        
           path_db = {

     

       15
       15
       -
             connection = "/run/scion-daemon/sd.path.db";

     

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

     

       16
       18
        
           };

     

       17
       19
        
           trust_db = {

     

       18
       18
       -
             connection = "/run/scion-daemon/sd.trust.db";

     

       20
       20
       +
             connection = "${connectionDir}/scion-daemon/sd.trust.db";

     

       19
       21
        
           };

     

       20
       22
        
           log.console = {

     

       21
       23
        
             level = "info";

     
···

       57
       59
        
               ExecStart = "${pkgs.scion}/bin/scion-daemon --config ${configFile}";

     

       58
       60
        
               Restart = "on-failure";

     

       59
       61
        
               DynamicUser = true;

     

       60
       60
       -
               RuntimeDirectory = "scion-daemon";

     

       62
       62
       +
               ${if globalCfg.stateless then "RuntimeDirectory" else "StateDirectory"} = "scion-daemon";

     

       61
       63
        
             };

     

       62
       64
        
           };

     

       63
       65
        
         };

+2 -1

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

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       +
         globalCfg = config.services.scion;

     

       6
       7
        
         cfg = config.services.scion.scion-dispatcher;

     

       7
       8
        
         toml = pkgs.formats.toml { };

     

       8
       9
        
         defaultConfig = {

     
···

       66
       67
        
               ExecStartPre = "${pkgs.coreutils}/bin/rm -rf /run/shm/dispatcher";

     

       67
       68
        
               ExecStart = "${pkgs.scion}/bin/scion-dispatcher --config ${configFile}";

     

       68
       69
        
               Restart = "on-failure";

     

       69
       69
       -
               RuntimeDirectory = "scion-dispatcher";

     

       70
       70
       +
               ${if globalCfg.stateless then "RuntimeDirectory" else "StateDirectory"} = "scion-dispatcher";

     

       70
       71
        
             };

     

       71
       72
        
           };

     

       72
       73
        
         };

+2 -1

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

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       +
         globalCfg = config.services.scion;

     

       6
       7
        
         cfg = config.services.scion.scion-router;

     

       7
       8
        
         toml = pkgs.formats.toml { };

     

       8
       9
        
         defaultConfig = {

     
···

       42
       43
        
               ExecStart = "${pkgs.scion}/bin/scion-router --config ${configFile}";

     

       43
       44
        
               Restart = "on-failure";

     

       44
       45
        
               DynamicUser = true;

     

       45
       45
       -
               RuntimeDirectory = "scion-router";

     

       46
       46
       +
               ${if globalCfg.stateless then "RuntimeDirectory" else "StateDirectory"} = "scion-router";

     

       46
       47
        
             };

     

       47
       48
        
           };

     

       48
       49
        
         };

+16

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

···

       8
       8
        
       {

     

       9
       9
        
         options.services.scion = {

     

       10
       10
        
           enable = mkEnableOption "all of the scion components and services";

     

       11
       11
       +
           stateless = mkOption {

     

       12
       12
       +
             type = types.bool;

     

       13
       13
       +
             default = true;

     

       14
       14
       +
             description = ''

     

       15
       15
       +
               Setting this value to false (stateful) can lead to improved caching and

     

       16
       16
       +
               performance.

     

       17
       17
       +
       

     

       18
       18
       +
               This option decides whether to persist the SCION path sqlite databases

     

       19
       19
       +
               on disk or not. Persisting this data can lead to database corruption in

     

       20
       20
       +
               extreme cases such as power outage, meaning SCION fails to work on the

     

       21
       21
       +
               next boot. This is being investigated.

     

       22
       22
       +
       

     

       23
       23
       +
               If true, /run/scion-* is used for data

     

       24
       24
       +
               If false, use /var/lib/scion-* is used for data

     

       25
       25
       +
             '';

     

       26
       26
       +
           };

     

       11
       27
        
           bypassBootstrapWarning = mkOption {

     

       12
       28
        
             type = types.bool;

     

       13
       29
        
             default = false;