From b3b8e0935a8e2615de384b677634aec7dd3de645 Mon Sep 17 00:00:00 2001 From: Zuzana Lena Ansorgova Date: Mon, 13 Jan 2025 10:54:49 +0100 Subject: [PATCH] Update CLI procedures --- .../proc_adding-a-default-http-proxy.adoc | 19 +++++++++++++------ .../modules/proc_adding-an-http-proxy.adoc | 2 ++ 2 files changed, 15 insertions(+), 6 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 c1ce91a729..a91f36c200 100644 --- a/guides/common/modules/proc_adding-a-default-http-proxy.adoc +++ b/guides/common/modules/proc_adding-a-default-http-proxy.adoc @@ -28,7 +28,8 @@ endif::[] ---- # 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"] ---- @@ -37,12 +38,18 @@ $ hammer http-proxy create \ --username=_My_HTTP_Proxy_User_Name_ \ --password=_My_HTTP_Proxy_Password_ \ --url http://_http-proxy.example.com_:8080 +--content_default_http_proxy ---- -. 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 4abcdfa778..353be9f10b 100644 --- a/guides/common/modules/proc_adding-an-http-proxy.adoc +++ b/guides/common/modules/proc_adding-an-http-proxy.adoc @@ -33,7 +33,9 @@ To use the CLI instead of the {ProjectWebUI}, see the xref:cli-adding-an-http-pr $ hammer http-proxy create \ --name _My_HTTP_Proxy_ \ --url _http-proxy.example.com:8080_ +--content_default_http_proxy <1> ---- +<1> Optional: Set the HTTP proxy as default for content synchronization. + If your HTTP proxy requires authentication, add the `--username _My_User_Name_` and `--password _My_Password_` options.