diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-12-11 12:57:36 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-12-11 12:57:36 +0100 |
| commit | b67fdd20686edb0980357c1a73ebc2ce70e28657 (patch) | |
| tree | 7c19097cedebe3ae926f1944fb9a8cbd8b7c00fb /nixos/modules | |
| parent | fc6d1471ce114dc91085b68337535ea83ca56682 (diff) | |
| parent | 565707c57abc6ee9e81d4f6c9bd5fed5bbac2d40 (diff) | |
| download | nixlib-b67fdd20686edb0980357c1a73ebc2ce70e28657.tar nixlib-b67fdd20686edb0980357c1a73ebc2ce70e28657.tar.gz nixlib-b67fdd20686edb0980357c1a73ebc2ce70e28657.tar.bz2 nixlib-b67fdd20686edb0980357c1a73ebc2ce70e28657.tar.lz nixlib-b67fdd20686edb0980357c1a73ebc2ce70e28657.tar.xz nixlib-b67fdd20686edb0980357c1a73ebc2ce70e28657.tar.zst nixlib-b67fdd20686edb0980357c1a73ebc2ce70e28657.zip | |
Merge pull request #11628 from grwlf/allproxy
set all_proxy environment variable
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/config/networking.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index b49f8a156d1d..293a42d38b5a 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -96,6 +96,15 @@ in example = "http://127.0.0.1:3128"; }; + allProxy = lib.mkOption { + type = types.nullOr types.str; + default = cfg.proxy.default; + description = '' + This option specifies the all_proxy environment variable. + ''; + example = "http://127.0.0.1:3128"; + }; + noProxy = lib.mkOption { type = types.nullOr types.str; default = null; @@ -183,6 +192,8 @@ in rsync_proxy = cfg.proxy.rsyncProxy; } // optionalAttrs (cfg.proxy.ftpProxy != null) { ftp_proxy = cfg.proxy.ftpProxy; + } // optionalAttrs (cfg.proxy.allProxy != null) { + all_proxy = cfg.proxy.allProxy; } // optionalAttrs (cfg.proxy.noProxy != null) { no_proxy = cfg.proxy.noProxy; }; |