summaryrefslogtreecommitdiffstats
path: root/documentation/ref-manual
diff options
context:
space:
mode:
authorScott Rifenbark <srifenbark@gmail.com>2016-04-01 11:15:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-06 23:11:58 +0100
commit763ae4e191e09c60dd35faf569f56781515273ba (patch)
treeb462731268e65cc3d706778dd37c7da9e7c4ae44 /documentation/ref-manual
parenta1295ed80ff4e80b423ac9e7511730319c82052a (diff)
downloadpoky-763ae4e191e09c60dd35faf569f56781515273ba.tar.gz
ref-manual: Updated verbiage on proxy handling
Fixes [YOCTO #9313] Update the DL_DIR variable description to add a cross-reference to the wiki page that talks about working behind a firewall. Updated the 14.12 FAQ entry with new information about working behind the firewall. (From yocto-docs rev: 056e6881951023e62a7363ba60fe73cd6d2932b6) Signed-off-by: Scott Rifenbark <srifenbark@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/ref-manual')
-rw-r--r--documentation/ref-manual/faq.xml42
-rw-r--r--documentation/ref-manual/ref-variables.xml3
2 files changed, 29 insertions, 16 deletions
diff --git a/documentation/ref-manual/faq.xml b/documentation/ref-manual/faq.xml
index 3137639d9a..d2e4e8eb1b 100644
--- a/documentation/ref-manual/faq.xml
+++ b/documentation/ref-manual/faq.xml
@@ -280,7 +280,7 @@
280 280
281 <qandaentry> 281 <qandaentry>
282 <question> 282 <question>
283 <para> 283 <para id='i-am-behind-a-firewall-and-need-to-use-a-proxy-server'>
284 I'm behind a firewall and need to use a proxy server. How do I do that? 284 I'm behind a firewall and need to use a proxy server. How do I do that?
285 </para> 285 </para>
286 </question> 286 </question>
@@ -288,24 +288,34 @@
288 <para> 288 <para>
289 Most source fetching by the OpenEmbedded build system is done 289 Most source fetching by the OpenEmbedded build system is done
290 by <filename>wget</filename> and you therefore need to specify 290 by <filename>wget</filename> and you therefore need to specify
291 the proxy settings in a <filename>.wgetrc</filename> file 291 the proxy settings in a <filename>.wgetrc</filename> file,
292 in your home directory. 292 which can be in your home directory if you are a single user
293 Following are some example settings for different proxy types: 293 or can be in <filename>/usr/local/etc/wgetrc</filename> as
294 a global user file.
295 </para>
296
297 <para>
298 Following is the applicable code for setting various proxy
299 types in the <filename>.wgetrc</filename> file.
300 By default, these settings are disabled with comments.
301 To use them, remove the comments:
294 <literallayout class='monospaced'> 302 <literallayout class='monospaced'>
295 Http/FTP proxy: 303 # You can set the default proxies for Wget to use for http, https, and ftp.
296 https_proxy = http://proxy.yoyodyne.com:18023/ 304 # They will override the value in the environment.
297 http_proxy = http://proxy.yoyodyne.com:18023/ 305 #https_proxy = http://proxy.yoyodyne.com:18023/
298 ftp_proxy = http://proxy.yoyodyne.com:18023/ 306 #http_proxy = http://proxy.yoyodyne.com:18023/
299 307 #ftp_proxy = http://proxy.yoyodyne.com:18023/
300 socks proxy: 308
301 export SOCKS_SERVER=`<replaceable>server</replaceable>:<replaceable>port</replaceable>` 309 # If you do not want to use proxy at all, set this to off.
302 unset http_proxy 310 #use_proxy = on
303 unset https_proxy
304 unset ftp_proxy
305 </literallayout> 311 </literallayout>
306 The Yocto Project also includes a 312 The Yocto Project also includes a
307 <filename>site.conf.sample</filename> file that shows how to 313 <filename>meta-poky/conf/site.conf.sample</filename> file that
308 configure CVS and Git proxy servers if needed. 314 shows how to configure CVS and Git proxy servers if needed.
315 For more information on setting up various proxy types and
316 configuring proxy servers, see the
317 "<ulink url='&YOCTO_WIKI_URL;/wiki/Working_Behind_a_Network_Proxy'>Working Behind a Network Proxy</ulink>"
318 Wiki page.
309 </para> 319 </para>
310 </answer> 320 </answer>
311 </qandaentry> 321 </qandaentry>
diff --git a/documentation/ref-manual/ref-variables.xml b/documentation/ref-manual/ref-variables.xml
index 45015a4096..fa652e57a1 100644
--- a/documentation/ref-manual/ref-variables.xml
+++ b/documentation/ref-manual/ref-variables.xml
@@ -3415,6 +3415,9 @@
3415 see this specific question in the 3415 see this specific question in the
3416 "<link linkend='how-does-the-yocto-project-obtain-source-code-and-will-it-work-behind-my-firewall-or-proxy-server'>FAQ</link>" 3416 "<link linkend='how-does-the-yocto-project-obtain-source-code-and-will-it-work-behind-my-firewall-or-proxy-server'>FAQ</link>"
3417 chapter. 3417 chapter.
3418 You can also refer to the
3419 "<ulink url='&YOCTO_WIKI_URL;/wiki/Working_Behind_a_Network_Proxy'>Working Behind a Network Proxy</ulink>"
3420 Wiki page.
3418 </para> 3421 </para>
3419 </glossdef> 3422 </glossdef>
3420 </glossentry> 3423 </glossentry>