deploy: 13895df

nightly/Installing_Proxy/index-katello.html

@@ -1348,14 +1348,16 @@ <h5 id="deploying-a-custom-ssl-certificate-to-smart-proxy-server_smart-proxy"><a
 <div class="title">Procedure</div>
 <ol class="arabic">
 <li>
-<p>On your Foreman&#160;server, validate the custom SSL certificate input files:</p>
+<p>On your Foreman&#160;server, generate a certificate bundle:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="nowrap"># katello-certs-check \
--t foreman-proxy \
--c <em>/root/smart-proxy_cert/smart-proxy_cert.pem</em> \ <b class="conum">(1)</b>
--k <em>/root/smart-proxy_cert/smart-proxy_cert_key.pem</em> \ <b class="conum">(2)</b>
--b <em>/root/smart-proxy_cert/ca_cert_bundle.pem</em> <b class="conum">(3)</b></pre>
+<pre class="nowrap"># foreman-proxy-certs-generate \
+--foreman-proxy-fqdn <em>smartproxy.example.com</em> \
+--certs-tar ~/<em>smartproxy.example.com</em>-certs.tar \
+--server-cert /root/<em>smart-proxy_cert/smart-proxy_cert.pem</em> \ <b class="conum">(1)</b>
+--server-key /root/<em>smart-proxy_cert/smart-proxy_cert_key.pem</em> \ <b class="conum">(2)</b>
+--server-ca-cert "/root/<em>smart-proxy_cert/ca_cert_bundle.pem</em> \ <b class="conum">(3)</b>
+--certs-update-server</pre>
 </div>
 </div>
 <div class="colist arabic">
@@ -1371,39 +1373,6 @@ <h5 id="deploying-a-custom-ssl-certificate-to-smart-proxy-server_smart-proxy"><a
 </li>
 </ol>
 </div>
-<div class="paragraph">
-<p>If you set a wildcard value <code>*</code> for the certificate&#8217;s Common Name <code>CN =</code> in the <code>/root/smart-proxy_cert/openssl.cnf</code> configuration file, you must add the <code>-t foreman-proxy</code> option to the <code>katello-certs-check</code> command.</p>
-</div>
-<div class="paragraph">
-<p>If the command is successful, it returns two <code>foreman-proxy-certs-generate</code> commands, one of which you must use to generate the certificate archive file for your Smart&#160;Proxy&#160;server.</p>
-</div>
-<div class="listingblock">
-<div class="title">Example output of <code>katello-certs-check</code></div>
-<div class="content">
-<pre class="nowrap">Validation succeeded.
-
-To use them inside a NEW $FOREMAN_PROXY, run this command:
-  foreman-proxy-certs-generate --foreman-proxy-fqdn "$FOREMAN_PROXY" \
-    --certs-tar "~/FOREMAN_PROXY-certs.tar" \
-    --server-cert "<em>/root/smart-proxy_cert/smart-proxy_cert.pem</em>" \
-    --server-key "<em>/root/smart-proxy_cert/smart-proxy_cert_key.pem</em>" \
-    --server-ca-cert "<em>/root/smart-proxy_cert/ca_cert_bundle.pem</em>" \
-
-To use them inside an EXISTING $FOREMAN_PROXY, run this command INSTEAD:
-  foreman-proxy-certs-generate --foreman-proxy-fqdn "$FOREMAN_PROXY" \
-    --certs-tar "~/FOREMAN_PROXY-certs.tar" \
-    --server-cert "<em>/root/smart-proxy_cert/smart-proxy_cert.pem</em>" \
-    --server-key "<em>/root/smart-proxy_cert/smart-proxy_cert_key.pem</em>" \
-    --server-ca-cert "<em>/root/smart-proxy_cert/ca_cert_bundle.pem</em>" \
-    --certs-update-server</pre>
-</div>
-</div>
-</li>
-<li>
-<p>On your Foreman&#160;server, from the output of the <code>katello-certs-check</code> command, depending on your requirements, enter the <code>foreman-proxy-certs-generate</code> command that generates a certificate for a new or existing Smart&#160;Proxy.</p>
-<div class="paragraph">
-<p>In this command, change <code>FOREMAN_PROXY</code> to the FQDN of your Smart&#160;Proxy&#160;server.</p>
-</div>
 </li>
 <li>
 <p>Retain a copy of the <code>foreman-installer</code> command that the <code>foreman-proxy-certs-generate</code> command returns for deploying the certificate to your Smart&#160;Proxy&#160;server.</p>
@@ -1426,7 +1395,7 @@ <h5 id="deploying-a-custom-ssl-certificate-to-smart-proxy-server_smart-proxy"><a
 <p>On your Foreman&#160;server, copy the certificate archive file to your Smart&#160;Proxy&#160;server:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="nowrap"># scp /root/smart-proxy_cert/<em>smartproxy.example.com</em>-certs.tar \
+<pre class="nowrap"># scp ~/<em>smartproxy.example.com</em>-certs.tar \
 root@<em>smartproxy.example.com</em>:/root/<em>smartproxy.example.com</em>-certs.tar</pre>
 </div>
 </div>

nightly/Installing_Proxy/index-satellite.html

@@ -1543,14 +1543,16 @@ <h5 id="deploying-a-custom-ssl-certificate-to-capsule-server_capsule"><a class="
 <div class="title">Procedure</div>
 <ol class="arabic">
 <li>
-<p>On your Satellite&#160;Server, validate the custom SSL certificate input files:</p>
+<p>On your Satellite&#160;Server, generate a certificate bundle:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="nowrap"># katello-certs-check \
--t capsule \
--c <em>/root/capsule_cert/capsule_cert.pem</em> \ <b class="conum">(1)</b>
--k <em>/root/capsule_cert/capsule_cert_key.pem</em> \ <b class="conum">(2)</b>
--b <em>/root/capsule_cert/ca_cert_bundle.pem</em> <b class="conum">(3)</b></pre>
+<pre class="nowrap"># capsule-certs-generate \
+--foreman-proxy-fqdn <em>capsule.example.com</em> \
+--certs-tar ~/<em>capsule.example.com</em>-certs.tar \
+--server-cert /root/<em>capsule_cert/capsule_cert.pem</em> \ <b class="conum">(1)</b>
+--server-key /root/<em>capsule_cert/capsule_cert_key.pem</em> \ <b class="conum">(2)</b>
+--server-ca-cert "/root/<em>capsule_cert/ca_cert_bundle.pem</em> \ <b class="conum">(3)</b>
+--certs-update-server</pre>
 </div>
 </div>
 <div class="colist arabic">
@@ -1566,39 +1568,6 @@ <h5 id="deploying-a-custom-ssl-certificate-to-capsule-server_capsule"><a class="
 </li>
 </ol>
 </div>
-<div class="paragraph">
-<p>If you set a wildcard value <code>*</code> for the certificate&#8217;s Common Name <code>CN =</code> in the <code>/root/capsule_cert/openssl.cnf</code> configuration file, you must add the <code>-t capsule</code> option to the <code>katello-certs-check</code> command.</p>
-</div>
-<div class="paragraph">
-<p>If the command is successful, it returns two <code>capsule-certs-generate</code> commands, one of which you must use to generate the certificate archive file for your Capsule&#160;Server.</p>
-</div>
-<div class="listingblock">
-<div class="title">Example output of <code>katello-certs-check</code></div>
-<div class="content">
-<pre class="nowrap">Validation succeeded.
-
-To use them inside a NEW $CAPSULE, run this command:
-  capsule-certs-generate --foreman-proxy-fqdn "$CAPSULE" \
-    --certs-tar "~/CAPSULE-certs.tar" \
-    --server-cert "<em>/root/capsule_cert/capsule_cert.pem</em>" \
-    --server-key "<em>/root/capsule_cert/capsule_cert_key.pem</em>" \
-    --server-ca-cert "<em>/root/capsule_cert/ca_cert_bundle.pem</em>" \
-
-To use them inside an EXISTING $CAPSULE, run this command INSTEAD:
-  capsule-certs-generate --foreman-proxy-fqdn "$CAPSULE" \
-    --certs-tar "~/CAPSULE-certs.tar" \
-    --server-cert "<em>/root/capsule_cert/capsule_cert.pem</em>" \
-    --server-key "<em>/root/capsule_cert/capsule_cert_key.pem</em>" \
-    --server-ca-cert "<em>/root/capsule_cert/ca_cert_bundle.pem</em>" \
-    --certs-update-server</pre>
-</div>
-</div>
-</li>
-<li>
-<p>On your Satellite&#160;Server, from the output of the <code>katello-certs-check</code> command, depending on your requirements, enter the <code>capsule-certs-generate</code> command that generates a certificate for a new or existing Capsule.</p>
-<div class="paragraph">
-<p>In this command, change <code>CAPSULE</code> to the FQDN of your Capsule&#160;Server.</p>
-</div>
 </li>
 <li>
 <p>Retain a copy of the <code>satellite-installer</code> command that the <code>capsule-certs-generate</code> command returns for deploying the certificate to your Capsule&#160;Server.</p>
@@ -1621,7 +1590,7 @@ <h5 id="deploying-a-custom-ssl-certificate-to-capsule-server_capsule"><a class="
 <p>On your Satellite&#160;Server, copy the certificate archive file to your Capsule&#160;Server:</p>
 <div class="listingblock">
 <div class="content">
-<pre class="nowrap"># scp /root/capsule_cert/<em>capsule.example.com</em>-certs.tar \
+<pre class="nowrap"># scp ~/<em>capsule.example.com</em>-certs.tar \
 root@<em>capsule.example.com</em>:/root/<em>capsule.example.com</em>-certs.tar</pre>
 </div>
 </div>