commit 96f7444bc8ede288c34d7a3ff4f740054f6c4154 · pyrox.dev/nixpkgs

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

···

       200
       200
        
             </listitem>

     

       201
       201
        
             <listitem>

     

       202
       202
        
               <para>

     

       203
       203
       +
                 [xray] (https://github.com/XTLS/Xray-core), a fully compatible

     

       204
       204
       +
                 v2ray-core replacement. Features XTLS, which when enabled on

     

       205
       205
       +
                 server and client, brings UDP FullCone NAT to proxy setups.

     

       206
       206
       +
                 Available as

     

       207
       207
       +
                 <link xlink:href="options.html#opt-services.xray.enable">services.xray</link>.

     

       208
       208
       +
               </para>

     

       209
       209
       +
             </listitem>

     

       210
       210
       +
             <listitem>

     

       211
       211
       +
               <para>

     

       203
       212
        
                 <link xlink:href="https://github.com/mozilla-services/syncstorage-rs">syncstorage-rs</link>,

     

       204
       213
        
                 a self-hostable sync server for Firefox. Available as

     

       205
       214
        
                 <link xlink:href="options.html#opt-services.firefox-syncserver.enable">services.firefox-syncserver</link>.

nixos/doc/manual/release-notes/rl-2211.section.md

···

       79
       79
        
       ## New Services {#sec-release-22.11-new-services}

     

       80
       80
        
       

     

       81
       81
        
       - [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable).

     

       82
       82
       +
       

     

       83
       83
       +
       - [xray] (https://github.com/XTLS/Xray-core), a fully compatible v2ray-core replacement. Features XTLS, which when enabled on server and client, brings UDP FullCone NAT to proxy setups. Available as [services.xray](options.html#opt-services.xray.enable).

     

       84
       84
       +
       

     

       82
       85
        
       - [syncstorage-rs](https://github.com/mozilla-services/syncstorage-rs), a self-hostable sync server for Firefox. Available as [services.firefox-syncserver](options.html#opt-services.firefox-syncserver.enable).

     

       83
       86
        
       

     

       84
       87
        
       - [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable).

nixos/modules/module-list.nix

···

       989
       989
        
         ./services/networking/xinetd.nix

     

       990
       990
        
         ./services/networking/xl2tpd.nix

     

       991
       991
        
         ./services/networking/x2goserver.nix

     

       992
       992
       +
         ./services/networking/xray.nix

     

       992
       993
        
         ./services/networking/xrdp.nix

     

       993
       994
        
         ./services/networking/yggdrasil.nix

     

       994
       995
        
         ./services/networking/zerobin.nix

+96

nixos/modules/services/networking/xray.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       {

     

       6
       6
       +
         options = {

     

       7
       7
       +
       

     

       8
       8
       +
           services.xray = {

     

       9
       9
       +
             enable = mkOption {

     

       10
       10
       +
               type = types.bool;

     

       11
       11
       +
               default = false;

     

       12
       12
       +
               description = lib.mdDoc ''

     

       13
       13
       +
                 Whether to run xray server.

     

       14
       14
       +
       

     

       15
       15
       +
                 Either `settingsFile` or `settings` must be specified.

     

       16
       16
       +
               '';

     

       17
       17
       +
             };

     

       18
       18
       +
       

     

       19
       19
       +
             package = mkOption {

     

       20
       20
       +
               type = types.package;

     

       21
       21
       +
               default = pkgs.xray;

     

       22
       22
       +
               defaultText = literalExpression "pkgs.xray";

     

       23
       23
       +
               description = lib.mdDoc ''

     

       24
       24
       +
                 Which xray package to use.

     

       25
       25
       +
               '';

     

       26
       26
       +
             };

     

       27
       27
       +
       

     

       28
       28
       +
             settingsFile = mkOption {

     

       29
       29
       +
               type = types.nullOr types.path;

     

       30
       30
       +
               default = null;

     

       31
       31
       +
               example = "/etc/xray/config.json";

     

       32
       32
       +
               description = lib.mdDoc ''

     

       33
       33
       +
                 The absolute path to the configuration file.

     

       34
       34
       +
       

     

       35
       35
       +
                 Either `settingsFile` or `settings` must be specified.

     

       36
       36
       +
       

     

       37
       37
       +
                 See <https://www.v2fly.org/en_US/config/overview.html>.

     

       38
       38
       +
               '';

     

       39
       39
       +
             };

     

       40
       40
       +
       

     

       41
       41
       +
             settings = mkOption {

     

       42
       42
       +
               type = types.nullOr (types.attrsOf types.unspecified);

     

       43
       43
       +
               default = null;

     

       44
       44
       +
               example = {

     

       45
       45
       +
                 inbounds = [{

     

       46
       46
       +
                   port = 1080;

     

       47
       47
       +
                   listen = "127.0.0.1";

     

       48
       48
       +
                   protocol = "http";

     

       49
       49
       +
                 }];

     

       50
       50
       +
                 outbounds = [{

     

       51
       51
       +
                   protocol = "freedom";

     

       52
       52
       +
                 }];

     

       53
       53
       +
               };

     

       54
       54
       +
               description = lib.mdDoc ''

     

       55
       55
       +
                 The configuration object.

     

       56
       56
       +
       

     

       57
       57
       +
                 Either `settingsFile` or `settings` must be specified.

     

       58
       58
       +
       

     

       59
       59
       +
                 See <https://www.v2fly.org/en_US/config/overview.html>.

     

       60
       60
       +
               '';

     

       61
       61
       +
             };

     

       62
       62
       +
           };

     

       63
       63
       +
       

     

       64
       64
       +
         };

     

       65
       65
       +
       

     

       66
       66
       +
         config = let

     

       67
       67
       +
           cfg = config.services.xray;

     

       68
       68
       +
           settingsFile = if cfg.settingsFile != null

     

       69
       69
       +
             then cfg.settingsFile

     

       70
       70
       +
             else pkgs.writeTextFile {

     

       71
       71
       +
               name = "xray.json";

     

       72
       72
       +
               text = builtins.toJSON cfg.settings;

     

       73
       73
       +
               checkPhase = ''

     

       74
       74
       +
                 ${cfg.package}/bin/xray -test -config $out

     

       75
       75
       +
               '';

     

       76
       76
       +
             };

     

       77
       77
       +
       

     

       78
       78
       +
         in mkIf cfg.enable {

     

       79
       79
       +
           assertions = [

     

       80
       80
       +
             {

     

       81
       81
       +
               assertion = (cfg.settingsFile == null) != (cfg.settings == null);

     

       82
       82
       +
               message = "Either but not both `settingsFile` and `settings` should be specified for xray.";

     

       83
       83
       +
             }

     

       84
       84
       +
           ];

     

       85
       85
       +
       

     

       86
       86
       +
           systemd.services.xray = {

     

       87
       87
       +
             description = "xray Daemon";

     

       88
       88
       +
             after = [ "network.target" ];

     

       89
       89
       +
             wantedBy = [ "multi-user.target" ];

     

       90
       90
       +
             serviceConfig = {

     

       91
       91
       +
               DynamicUser = true;

     

       92
       92
       +
               ExecStart = "${cfg.package}/bin/xray -config ${settingsFile}";

     

       93
       93
       +
             };

     

       94
       94
       +
           };

     

       95
       95
       +
         };

     

       96
       96
       +
       }