commit bf3360cdcfee144ce349457b248de3b93aee3c3d · pyrox.dev/nixpkgs

+2 -2

nixos/modules/misc/ids.nix

···

       328
       328
        
             qemu-libvirtd = 301;

     

       329
       329
        
             # kvm = 302; # unused

     

       330
       330
        
             # render = 303; # unused

     

       331
       331
       -
             zeronet = 304;

     

       331
       331
       +
             # zeronet = 304; # removed 2019-01-03

     

       332
       332
        
             lirc = 305;

     

       333
       333
        
             lidarr = 306;

     

       334
       334
        
             slurm = 307;

     
···

       629
       629
        
             qemu-libvirtd = 301;

     

       630
       630
        
             kvm = 302; # default udev rules from systemd requires these

     

       631
       631
        
             render = 303; # default udev rules from systemd requires these

     

       632
       632
       -
             zeronet = 304;

     

       632
       632
       +
             # zeronet = 304; # removed 2019-01-03

     

       633
       633
        
             lirc = 305;

     

       634
       634
        
             lidarr = 306;

     

       635
       635
        
             slurm = 307;

+32 -58

nixos/modules/services/networking/zeronet.nix

···

       1
       1
        
       { config, lib, pkgs, ... }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       +
         inherit (lib) generators literalExample mkEnableOption mkIf mkOption recursiveUpdate types;

     

       4
       5
        
         cfg = config.services.zeronet;

     

       6
       6
       +
         dataDir = "/var/lib/zeronet";

     

       7
       7
       +
         configFile = pkgs.writeText "zeronet.conf" (generators.toINI {} (recursiveUpdate defaultSettings cfg.settings));

     

       5
       8
        
       

     

       6
       6
       -
         zConfFile = pkgs.writeTextFile {

     

       7
       7
       -
           name = "zeronet.conf";

     

       8
       8
       -
       

     

       9
       9
       -
           text = ''

     

       10
       10
       -
             [global]

     

       11
       11
       -
             data_dir = ${cfg.dataDir}

     

       12
       12
       -
             log_dir = ${cfg.logDir}

     

       13
       13
       -
           '' + lib.optionalString (cfg.port != null) ''

     

       14
       14
       -
             ui_port = ${toString cfg.port}

     

       15
       15
       -
           '' + lib.optionalString (cfg.fileserverPort != null) ''

     

       16
       16
       -
             fileserver_port = ${toString cfg.fileserverPort}

     

       17
       17
       -
           '' + lib.optionalString (cfg.torAlways) ''

     

       18
       18
       -
             tor = always

     

       19
       19
       -
           '' + cfg.extraConfig;

     

       9
       9
       +
         defaultSettings = {

     

       10
       10
       +
           global = {

     

       11
       11
       +
             data_dir = dataDir;

     

       12
       12
       +
             log_dir = dataDir;

     

       13
       13
       +
             ui_port = cfg.port;

     

       14
       14
       +
             fileserver_port = cfg.fileserverPort;

     

       15
       15
       +
             tor = if !cfg.tor then "disable" else if cfg.torAlways then "always" else "enable";

     

       16
       16
       +
           };

     

       20
       17
        
         };

     

       21
       18
        
       in with lib; {

     

       22
       19
        
         options.services.zeronet = {

     

       23
       20
        
           enable = mkEnableOption "zeronet";

     

       24
       21
        
       

     

       25
       25
       -
           dataDir = mkOption {

     

       26
       26
       -
             type = types.path;

     

       27
       27
       -
             default = "/var/lib/zeronet";

     

       28
       28
       -
             example = "/home/okina/zeronet";

     

       29
       29
       -
             description = "Path to the zeronet data directory.";

     

       30
       30
       -
           };

     

       22
       22
       +
           settings = mkOption {

     

       23
       23
       +
             type = with types; attrsOf (oneOf [ str int bool (listOf str) ]);

     

       24
       24
       +
             default = {};

     

       25
       25
       +
             example = literalExample "global.tor = enable;";

     

       31
       26
        
       

     

       32
       32
       -
           logDir = mkOption {

     

       33
       33
       -
             type = types.path;

     

       34
       34
       -
             default = "/var/log/zeronet";

     

       35
       35
       -
             example = "/home/okina/zeronet/log";

     

       36
       36
       -
             description = "Path to the zeronet log directory.";

     

       27
       27
       +
             description = ''

     

       28
       28
       +
               <filename>zeronet.conf</filename> configuration. Refer to

     

       29
       29
       +
               <link xlink:href="https://zeronet.readthedocs.io/en/latest/faq/#is-it-possible-to-use-a-configuration-file"/>

     

       30
       30
       +
               for details on supported values;

     

       31
       31
       +
             '';

     

       37
       32
        
           };

     

       38
       33
        
       

     

       39
       34
        
           port = mkOption {

     

       40
       40
       -
             type = types.nullOr types.int;

     

       41
       41
       -
             default = null;

     

       35
       35
       +
             type = types.int;

     

       36
       36
       +
             default = 43110;

     

       42
       37
        
             example = 43110;

     

       43
       38
        
             description = "Optional zeronet web UI port.";

     

       44
       39
        
           };

     
···

       63
       58
        
             default = false;

     

       64
       59
        
             description = "Use TOR for all zeronet traffic.";

     

       65
       60
        
           };

     

       66
       66
       -
       

     

       67
       67
       -
           extraConfig = mkOption {

     

       68
       68
       -
             type = types.lines;

     

       69
       69
       -
             default = "";

     

       70
       70
       -
       

     

       71
       71
       -
             description = ''

     

       72
       72
       -
               Extra configuration. Contents will be added verbatim to the

     

       73
       73
       -
               configuration file at the end.

     

       74
       74
       -
             '';

     

       75
       75
       -
           };

     

       76
       61
        
         };

     

       77
       62
        
       

     

       78
       63
        
         config = mkIf cfg.enable {

     

       79
       64
        
           services.tor = mkIf cfg.tor {

     

       80
       65
        
             enable = true;

     

       81
       66
        
             controlPort = 9051;

     

       67
       67
       +
       

     

       82
       68
        
             extraConfig = ''

     

       83
       69
        
               CacheDirectoryGroupReadable 1

     

       84
       70
        
               CookieAuthentication 1

     
···

       86
       72
        
             '';

     

       87
       73
        
           };

     

       88
       74
        
       

     

       89
       89
       -
           systemd.tmpfiles.rules = [

     

       90
       90
       -
             "d '${cfg.dataDir}' 750 zeronet zeronet - -"

     

       91
       91
       -
             "d '${cfg.logDir}' 750 zeronet zeronet - -"

     

       92
       92
       -
           ];

     

       93
       93
       -
       

     

       94
       75
        
           systemd.services.zeronet = {

     

       95
       76
        
             description = "zeronet";

     

       96
       77
        
             after = [ "network.target" (optionalString cfg.tor "tor.service") ];

     

       97
       78
        
             wantedBy = [ "multi-user.target" ];

     

       98
       79
        
       

     

       99
       80
        
             serviceConfig = {

     

       100
       100
       -
               PrivateTmp = "yes";

     

       101
       81
        
               User = "zeronet";

     

       102
       102
       -
               Group = "zeronet";

     

       103
       103
       -
               ExecStart = "${pkgs.zeronet}/bin/zeronet --config_file ${zConfFile}";

     

       104
       104
       -
             };

     

       105
       105
       -
           };

     

       106
       106
       -
       

     

       107
       107
       -
           users = {

     

       108
       108
       -
             groups.zeronet.gid = config.ids.gids.zeronet;

     

       109
       109
       -
       

     

       110
       110
       -
             users.zeronet = {

     

       111
       111
       -
               description = "zeronet service user";

     

       112
       112
       -
               home = cfg.dataDir;

     

       113
       113
       -
               createHome = true;

     

       114
       114
       -
               group = "zeronet";

     

       115
       115
       -
               extraGroups = mkIf cfg.tor [ "tor" ];

     

       116
       116
       -
               uid = config.ids.uids.zeronet;

     

       82
       82
       +
               DynamicUser = true;

     

       83
       83
       +
               StateDirectory = "zeronet";

     

       84
       84
       +
               SupplementaryGroups = mkIf cfg.tor [ "tor" ];

     

       85
       85
       +
               ExecStart = "${pkgs.zeronet}/bin/zeronet --config_file ${configFile}";

     

       117
       86
        
             };

     

       118
       87
        
           };

     

       119
       88
        
         };

     

       89
       89
       +
       

     

       90
       90
       +
         imports = [

     

       91
       91
       +
           (mkRemovedOptionModule [ "services" "zeronet" "dataDir" ] "Zeronet will store data by default in /var/lib/zeronet")

     

       92
       92
       +
           (mkRemovedOptionModule [ "services" "zeronet" "logDir" ] "Zeronet will log by default in /var/lib/zeronet")

     

       93
       93
       +
         ];

     

       120
       94
        
       

     

       121
       95
        
         meta.maintainers = with maintainers; [ chiiruno ];

     

       122
       96
        
       }