aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2019-08-24 14:55:19 -0400
committerGitHub <noreply@github.com>2019-08-24 14:55:19 -0400
commit15ee2bc2fe6768a2ec1b312b6682299bbc407d86 (patch)
treea68a87532060d835e2ce0a30d6dbaf47c8becca0 /doc
parentf435634a29551754d5f7303b0a60cd8fe2df2079 (diff)
parent057af1dbd802987df7990d965e08db185820a193 (diff)
Merge pull request #2946 from vmandela/proxy
installer: handle network proxy in systemd multi-user install
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/installation/env-variables.xml18
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/manual/installation/env-variables.xml b/doc/manual/installation/env-variables.xml
index d1ee0bb2e..e2b8fc867 100644
--- a/doc/manual/installation/env-variables.xml
+++ b/doc/manual/installation/env-variables.xml
@@ -67,5 +67,23 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon
</screen>
</section>
+<section xml:id="sec-installer-proxy-settings">
+
+<title>Proxy Environment Variables</title>
+
+<para>The Nix installer has special handling for these proxy-related
+environment variables:
+<varname>http_proxy</varname>, <varname>https_proxy</varname>,
+<varname>ftp_proxy</varname>, <varname>no_proxy</varname>,
+<varname>HTTP_PROXY</varname>, <varname>HTTPS_PROXY</varname>,
+<varname>FTP_PROXY</varname>, <varname>NO_PROXY</varname>.
+</para>
+<para>If any of these variables are set when running the Nix installer,
+then the installer will create an override file at
+<filename>/etc/systemd/system/nix-daemon.service.d/override.conf</filename>
+so <command>nix-daemon</command> will use them.
+</para>
+</section>
+
</section>
</chapter>