commit 31c4498a471f1336736d56fce1ecce74ed77b86c · pyrox.dev/nixpkgs

+2 -2

nixos/modules/misc/ids.nix

···

       290
       290
        
             geoip = 272;

     

       291
       291
        
             fcron = 273;

     

       292
       292
        
             aria2 = 274;

     

       293
       293
       -
       	  

     

       293
       293
       +
       

     

       294
       294
        
             # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!

     

       295
       295
        
       

     

       296
       296
        
             nixbld = 30000; # start of range of uids

     
···

       548
       548
        
             #rpc = 271; # unused

     

       549
       549
        
             #geoip = 272; # unused

     

       550
       550
        
             fcron = 273;

     

       551
       551
       -
       	  aria2 = 274;

     

       551
       551
       +
             aria2 = 274;

     

       552
       552
        
       

     

       553
       553
        
             # When adding a gid, make sure it doesn't match an existing

     

       554
       554
        
             # uid. Users and groups with the same name should have equal

+22 -24

nixos/modules/services/networking/aria2.nix

···

       36
       36
        
       

     

       37
       37
        
                 Targets are downloaded to ${downloadDir} by default and are

     

       38
       38
        
                 accessible to users in the "aria2" group.

     

       39
       39
       -
                 '';

     

       39
       39
       +
               '';

     

       40
       40
        
             };

     

       41
       41
        
             openPorts = mkOption {

     

       42
       42
        
               type = types.bool;

     

       43
       43
       -
               default = true;

     

       43
       43
       +
               default = false;

     

       44
       44
        
               description = ''

     

       45
       45
       -
                 Open the ports in the firewall. Defaults are:

     

       46
       46
       -
                 - UDP 6881-6999 for transfers

     

       47
       47
       -
                 - TCP 6800 for RPC

     

       48
       48
       -
                 '';

     

       45
       45
       +
                 Open listen and RPC ports found in listenPortRange and rpcListenPort

     

       46
       46
       +
                 options in the firewall.

     

       47
       47
       +
               '';

     

       49
       48
        
             };

     

       50
       49
        
             downloadDir = mkOption {

     

       51
       50
        
               type = types.string;

     

       52
       51
        
               default = "${downloadDir}";

     

       53
       52
        
               description = ''

     

       54
       53
        
                 Directory to store downloaded files.

     

       55
       55
       -
                 '';

     

       54
       54
       +
               '';

     

       56
       55
        
             };

     

       57
       56
        
             listenPortRange = mkOption {

     

       58
       57
        
               type = types.listOf types.attrs;

     

       59
       58
        
               default = [ { from = 6881; to = 6999; } ];

     

       60
       59
        
               description = ''

     

       61
       60
        
                 Set UDP listening port range used by DHT(IPv4, IPv6) and UDP tracker.

     

       62
       62
       -
                 '';

     

       61
       61
       +
               '';

     

       63
       62
        
             };

     

       64
       63
        
             rpcListenPort = mkOption {

     

       65
       64
        
               type = types.int;

     
···

       72
       71
        
               description = ''

     

       73
       72
        
                 Set RPC secret authorization token.

     

       74
       73
        
                 Read https://aria2.github.io/manual/en/html/aria2c.html#rpc-auth to know how this option value is used.

     

       75
       75
       -
                 '';

     

       74
       74
       +
               '';

     

       76
       75
        
             };

     

       77
       76
        
             extraArguments = mkOption {

     

       78
       77
        
               type = types.string;

     

       79
       79
       -
               example = "--rpc-secret=12345 --enable-rpc --rpc-listen-all";

     

       78
       78
       +
               example = "--rpc-listen-all --remote-time=true";

     

       80
       79
        
               default = "";

     

       81
       80
        
               description = ''

     

       82
       81
        
                 Additional arguments to be passed to Aria2.

     

       83
       83
       -
                 '';

     

       82
       82
       +
               '';

     

       84
       83
        
             };

     

       85
       84
        
           };

     

       86
       85
        
         };

     

       87
       86
        
       

     

       88
       87
        
         config = mkIf cfg.enable {

     

       89
       89
       -
           

     

       88
       88
       +
       

     

       90
       89
        
           # Need to open ports for proper functioning

     

       91
       90
        
           networking.firewall = mkIf cfg.openPorts {

     

       92
       91
        
             allowedUDPPortRanges = config.services.aria2.listenPortRange;

     
···

       109
       108
        
             wantedBy = [ "multi-user.target" ];

     

       110
       109
        
             preStart = ''

     

       111
       110
        
               mkdir -m 0770 -p "${homeDir}"

     

       112
       112
       -
       				chown aria2:aria2 "${homeDir}"

     

       111
       111
       +
               chown aria2:aria2 "${homeDir}"

     

       113
       112
        
               if [[ ! -d "${config.services.aria2.downloadDir}" ]]

     

       114
       114
       -
       				then 

     

       115
       115
       -
       					mkdir -m 0770 -p "${config.services.aria2.downloadDir}"

     

       116
       116
       -
       					chown aria2:aria2 "${config.services.aria2.downloadDir}"

     

       117
       117
       -
       				fi

     

       113
       113
       +
               then 

     

       114
       114
       +
                 mkdir -m 0770 -p "${config.services.aria2.downloadDir}"

     

       115
       115
       +
                 chown aria2:aria2 "${config.services.aria2.downloadDir}"

     

       116
       116
       +
               fi

     

       118
       117
        
               if [[ ! -e "${sessionFile}" ]]

     

       119
       119
       -
       				then 

     

       120
       120
       -
       					touch "${sessionFile}"

     

       121
       121
       -
       					chown aria2:aria2 "${sessionFile}"

     

       122
       122
       -
       				fi

     

       118
       118
       +
               then 

     

       119
       119
       +
                 touch "${sessionFile}"

     

       120
       120
       +
                 chown aria2:aria2 "${sessionFile}"

     

       121
       121
       +
               fi

     

       123
       122
        
               cp -f "${settingsFile}" "${settingsDir}/aria2.conf"

     

       124
       123
        
             '';

     

       125
       124
        
       

     
···

       129
       128
        
               ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

     

       130
       129
        
               User = "aria2";

     

       131
       130
        
               Group = "aria2";

     

       132
       132
       -
       				PermissionsStartOnly = true;

     

       131
       131
       +
               PermissionsStartOnly = true;

     

       133
       132
        
             };

     

       134
       133
        
           };

     

       135
       134
        
         };

     

       136
       136
       -
       }

     

       137
       137
       -
       

     

       135
       135
       +
       }