diff --git a/guides/common/assembly_configuring-satellite-custom-server-certificate.adoc b/guides/common/assembly_configuring-satellite-custom-server-certificate.adoc index e99f603f275..25da51940bb 100644 --- a/guides/common/assembly_configuring-satellite-custom-server-certificate.adoc +++ b/guides/common/assembly_configuring-satellite-custom-server-certificate.adoc @@ -10,8 +10,10 @@ include::modules/proc_creating-a-custom-ssl-certificate.adoc[leveloffset=+1] include::modules/proc_deploying-a-custom-ssl-certificate-to-foreman-server.adoc[leveloffset=+1] +ifndef::foremanctl[] :common-example-com: {foreman-example-com} include::modules/proc_deploying-a-custom-ssl-certificate-to-hosts.adoc[leveloffset=+1] :!common-example-com: include::modules/proc_deploying-a-custom-ssl-certificate-to-smartproxies.adoc[leveloffset=+1] +endif::[] diff --git a/guides/common/assembly_configuring-satellite-with-an-http-proxy.adoc b/guides/common/assembly_configuring-satellite-with-an-http-proxy.adoc index aaaa7dac03c..0f031fa3973 100644 --- a/guides/common/assembly_configuring-satellite-with-an-http-proxy.adoc +++ b/guides/common/assembly_configuring-satellite-with-an-http-proxy.adoc @@ -8,9 +8,11 @@ include::modules/proc_adding-a-default-http-proxy-by-using-web-ui.adoc[leveloffs include::modules/proc_adding-a-default-http-proxy-by-using-cli.adoc[leveloffset=+1] +ifndef::foremanctl[] ifndef::foreman-deb[] include::modules/proc_configuring-selinux-to-ensure-access-on-custom-ports.adoc[leveloffset=+1] endif::[] +endif::[] include::modules/proc_using-an-http-proxy-for-all-http-requests-by-using-web-ui.adoc[leveloffset=+1] @@ -20,9 +22,11 @@ include::modules/proc_excluding-hosts-from-receiving-proxied-requests-by-using-w include::modules/proc_excluding-hosts-from-receiving-proxied-requests-by-using-cli.adoc[leveloffset=+1] +ifndef::foremanctl[] ifndef::satellite[] include::modules/proc_configuring-http-proxy-for-pxe-file-downloads-on-smart-proxies.adoc[leveloffset=+1] endif::[] +endif::[] include::modules/proc_resetting-the-http-proxy-by-using-web-ui.adoc[leveloffset=+1] diff --git a/guides/common/assembly_customize-the-installation.adoc b/guides/common/assembly_customize-the-installation.adoc deleted file mode 100644 index 8c054809185..00000000000 --- a/guides/common/assembly_customize-the-installation.adoc +++ /dev/null @@ -1,3 +0,0 @@ -:_mod-docs-content-type: ASSEMBLY - -include::modules/con_customize-the-installation.adoc[] \ No newline at end of file diff --git a/guides/common/modules/con_customize-the-installation.adoc b/guides/common/modules/con_customize-the-installation.adoc deleted file mode 100644 index 005e7d6499e..00000000000 --- a/guides/common/modules/con_customize-the-installation.adoc +++ /dev/null @@ -1,5 +0,0 @@ -:_mod-docs-content-type: CONCEPT - -[id="customize-the-installation"] -= Customize the installation - diff --git a/guides/common/modules/con_performing-additional-configuration.adoc b/guides/common/modules/con_performing-additional-configuration.adoc index 1d2d36a32fe..5bae474d3ed 100644 --- a/guides/common/modules/con_performing-additional-configuration.adoc +++ b/guides/common/modules/con_performing-additional-configuration.adoc @@ -4,5 +4,8 @@ = Performing additional configuration on {ProjectServer} [role="_abstract"] -You can enable additional features on {ProjectServer}, such as {Insights} integration, pull-based transport for remote execution, and HTTP proxy. -While you can configure these features after the initial setup, you can also configure many of them during the installation by using the corresponding `{foreman-installer}` options. +You can enable additional features on {ProjectServer}, such as {Insights} integration, pull-based transport for remote execution, or the usage of HTTP proxies. +While you can configure these features after the initial setup, you can also configure many of them during the installation by using the corresponding +ifdef::foremanctl[`{foremanctl-installer}`] +ifndef::foremanctl[`{foreman-installer}`] +options. diff --git a/guides/doc-Installing_Server/master.adoc b/guides/doc-Installing_Server/master.adoc index 60c320cfa73..493ab0600db 100644 --- a/guides/doc-Installing_Server/master.adoc +++ b/guides/doc-Installing_Server/master.adoc @@ -30,14 +30,11 @@ include::common/assembly_preparing-environment-for-project-server-installation.a include::common/assembly_installing-server-connected.adoc[leveloffset=+1] -ifdef::foremanctl[] -include::common/assembly_customize-the-installation.adoc[leveloffset=+1] -endif::[] - ifndef::foremanctl[] ifdef::katello,orcharhino,satellite[] include::common/modules/proc_tuning-with-predefined-profiles.adoc[leveloffset=+1] endif::[] +endif::[] include::common/modules/con_performing-additional-configuration.adoc[leveloffset=+1] @@ -45,14 +42,17 @@ ifdef::satellite[] include::common/modules/proc_configuring-project-server-as-insights-client.adoc[leveloffset=+2] endif::[] +ifndef::foremanctl[] ifdef::orcharhino,satellite[] include::common/assembly_installing-and-configuring-insights-iop.adoc[leveloffset=+2] endif::[] +endif::[] ifdef::satellite[] include::common/assembly_importing-the-project-client-name-repository.adoc[leveloffset=+2] endif::[] +ifndef::foremanctl[] ifdef::foreman-el,foreman-deb[] include::common/modules/proc_enabling-remote-execution.adoc[leveloffset=+2] endif::[] @@ -66,9 +66,11 @@ include::common/modules/proc_configuring-server-to-consume-content-from-a-custom include::common/modules/proc_configuring-server-to-consume-content-from-a-custom-cdn-by-using-cli.adoc[leveloffset=+2] endif::[] +endif::[] include::common/assembly_configuring-satellite-with-an-http-proxy.adoc[leveloffset=+2] +ifndef::foremanctl[] include::common/modules/proc_enabling-power-management-on-hosts.adoc[leveloffset=+2] include::common/modules/proc_configuring-satellite-for-outgoing-emails.adoc[leveloffset=+2] @@ -81,19 +83,20 @@ ifdef::katello,orcharhino,satellite[] include::common/assembly_configuring-an-alternate-cname.adoc[leveloffset=+2] ifndef::foremanctl[] - include::common/assembly_configuring-satellite-custom-server-certificate.adoc[leveloffset=+2] include::common/modules/proc_resetting-custom-ssl-certificate-to-default-self-signed-certificate-on-project.adoc[leveloffset=+2] endif::[] +endif::[] +ifndef::foremanctl[] :numbered!: [appendix] include::common/modules/proc_restoring-manual-changes-overwritten-by-a-puppet-run.adoc[leveloffset=+1] endif::[] -endif::[] ifndef::orcharhino,satellite[] include::common/ribbons.adoc[] endif::[] +endif::[] diff --git a/guides/doc-Installing_Server_Disconnected/master.adoc b/guides/doc-Installing_Server_Disconnected/master.adoc index 5167573161e..2f8780d5bf7 100644 --- a/guides/doc-Installing_Server_Disconnected/master.adoc +++ b/guides/doc-Installing_Server_Disconnected/master.adoc @@ -31,10 +31,6 @@ include::common/assembly_preparing-environment-for-project-server-installation.a include::common/assembly_installing-satellite-server-disconnected.adoc[leveloffset=+1] -ifdef::foremanctl[] -include::common/assembly_customize-the-installation.adoc[leveloffset=+1] -endif::[] - ifndef::foremanctl[] include::common/modules/proc_tuning-with-predefined-profiles.adoc[leveloffset=+1]