From 53eb5e85dc458057600cec4f16664e7ea19c5f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lena=20Ansorgov=C3=A1?= Date: Mon, 20 Jan 2025 21:31:45 +0100 Subject: [PATCH] Add option set new HTTP proxy as default (#3510) Co-authored-by: Gaurav Talreja --- .../proc_adding-a-default-http-proxy.adoc | 26 ++++++++++++------- .../modules/proc_adding-an-http-proxy.adoc | 3 +++ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/guides/common/modules/proc_adding-a-default-http-proxy.adoc b/guides/common/modules/proc_adding-a-default-http-proxy.adoc index 60c30615005..ccac4be7181 100644 --- a/guides/common/modules/proc_adding-a-default-http-proxy.adoc +++ b/guides/common/modules/proc_adding-a-default-http-proxy.adoc @@ -15,9 +15,10 @@ To use the CLI instead of the {ProjectWebUI}, see the xref:cli-adding-a-default- . Optional: If authentication is required, in the *Username* field, enter the username to authenticate with. . Optional: If authentication is required, in the *Password* field, enter the password to authenticate with. . To test connection to the proxy, click *Test Connection*. +ifdef::katello,orcharhino,satellite[] +. Select the *Default content HTTP proxy* option to set the new HTTP proxy as default for content synchronization. +endif::[] . Click *Submit*. -. In the {ProjectWebUI}, navigate to *Administer* > *Settings*, and click the *Content* tab. -. Set the *Default HTTP Proxy* setting to the created HTTP proxy. [id="cli-adding-a-default-http-proxy_{context}"] .CLI procedure @@ -27,7 +28,8 @@ To use the CLI instead of the {ProjectWebUI}, see the xref:cli-adding-a-default- ---- # unset http_proxy https_proxy no_proxy ---- -. Add an HTTP proxy entry to {Project}: +ifdef::katello,orcharhino,satellite[] +. Add an HTTP proxy entry to {Project} and set the HTTP proxy as default for content synchronization: + [options="nowrap" subs="+quotes"] ---- @@ -35,13 +37,19 @@ $ hammer http-proxy create \ --name=_My_HTTP_Proxy_ \ --username=_My_HTTP_Proxy_User_Name_ \ --password=_My_HTTP_Proxy_Password_ \ ---url http://_http-proxy.example.com_:8080 +--url http://_http-proxy.example.com_:8080 \ +--content-default-http-proxy true ---- -. Configure {Project} to use this HTTP proxy by default: +endif::[] +ifndef::katello,orcharhino,satellite[] +. Add an HTTP proxy entry to {Project}: + -[options="nowrap" subs="+quotes,attributes"] +[options="nowrap" subs="+quotes"] ---- -$ hammer settings set \ ---name=content_default_http_proxy \ ---value=__My_HTTP_Proxy__ +$ hammer http-proxy create \ +--name=_My_HTTP_Proxy_ \ +--username=_My_HTTP_Proxy_User_Name_ \ +--password=_My_HTTP_Proxy_Password_ \ +--url http://_http-proxy.example.com_:8080 ---- +endif::[] \ No newline at end of file diff --git a/guides/common/modules/proc_adding-an-http-proxy.adoc b/guides/common/modules/proc_adding-an-http-proxy.adoc index 09e0ece2b00..691e006ef43 100644 --- a/guides/common/modules/proc_adding-an-http-proxy.adoc +++ b/guides/common/modules/proc_adding-an-http-proxy.adoc @@ -19,6 +19,7 @@ To use the CLI instead of the {ProjectWebUI}, see the xref:cli-adding-an-http-pr . In the *URL* field, enter the URL for the HTTP proxy, including the port number. . If your HTTP proxy requires authentication, enter a *Username* and *Password*. . Optional: In the *Test URL* field, enter the HTTP proxy URL, then click *Test Connection* to ensure that you can connect to the HTTP proxy from {Project}. +. Optional: Select the *Default content HTTP proxy* option to set the new HTTP proxy as default for content synchronization. . Click the *Locations* tab and add a location. . Click the *Organization* tab and add an organization. . Click *Submit*. @@ -34,6 +35,8 @@ $ hammer http-proxy create \ --url _http-proxy.example.com:8080_ ---- + +Optional: To set the HTTP proxy as default for content synchronization, add the `--content-default-http-proxy true` option. ++ If your HTTP proxy requires authentication, add the `--username _My_User_Name_` and `--password _My_Password_` options. ifndef::orcharhino[]