Skip to content

Commit

Permalink
docs: update proxies to use http
Browse files Browse the repository at this point in the history
On howtoguide for configuring proxies, we are using by default
the http prefix for http proxies and https prefix for the https
proxies. We are now changing the default to use http on both
http and https, but adding a note that users might need
to use the https prefix depending on their proxy setup.

Fixes: #2881
  • Loading branch information
lucasmoura committed Jul 25, 2024
1 parent 9be510a commit cac5f3a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
1 change: 1 addition & 0 deletions custom_wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ honor
honored
hostname
html
http
https
init
internetless
Expand Down
16 changes: 11 additions & 5 deletions docs/howtoguides/configure_proxies.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ addition, the Ubuntu Pro Client will automatically set up proxies for all
programs required for enabling Ubuntu Pro services. This includes APT, snaps,
and Livepatch.

.. note::

Throughout this guide, we will set the HTTPS proxy with an http prefix.
However, depending on your proxy setup, you might need to configure the
Pro HTTPS proxy with a https prefix.

HTTP/HTTPS proxies
==================

Expand All @@ -18,7 +24,7 @@ To configure standard HTTP and/or HTTPS proxies, run the following commands:
.. code-block:: bash
$ sudo pro config set http_proxy=http://host:port
$ sudo pro config set https_proxy=https://host:port
$ sudo pro config set https_proxy=http://host:port
After running the above commands, Ubuntu Pro Client will:

Expand Down Expand Up @@ -50,7 +56,7 @@ your global APT proxy configuration, run the following commands:
.. code-block:: bash
$ sudo pro config set global_apt_http_proxy=http://host:port
$ sudo pro config set global_apt_https_proxy=https://host:port
$ sudo pro config set global_apt_https_proxy=http://host:port
After running the above commands, Ubuntu Pro Client will:

Expand Down Expand Up @@ -87,7 +93,7 @@ following commands instead:
.. code-block:: bash
$ sudo pro config set ua_apt_http_proxy=http://host:port
$ sudo pro config set ua_apt_https_proxy=https://host:port
$ sudo pro config set ua_apt_https_proxy=http://host:port
Authenticate your proxy server
==============================
Expand Down Expand Up @@ -115,9 +121,9 @@ proxies set:
.. code-block:: text
http_proxy http://proxy
https_proxy https://proxy
https_proxy http://proxy
global_apt_http_proxy http://aptproxy
global_apt_https_proxy https://aptproxy
global_apt_https_proxy http://aptproxy
Or it may look like this if there are no proxies set:

Expand Down
2 changes: 2 additions & 0 deletions wordlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,5 @@ ua
UI
VM
YAML
http
https

0 comments on commit cac5f3a

Please sign in to comment.