Skip to content

Make foremanctl customizations visible #4803

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jafiala wants to merge 17 commits into
base: master
Choose a base branch
from
+20 −20
Open

Make foremanctl customizations visible #4803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
043fcdd
Make foremanctl customizations visible
jafiala Apr 29, 2026
7c0d3d7
Remove extra endif
jafiala Apr 29, 2026
f12b657
Fix ifdefs
jafiala Apr 29, 2026
bcd8465
Correctly wrap ifdefs around cname assembly
jafiala Apr 29, 2026
868219d
Dummy commit
jafiala Apr 30, 2026
684e0d1
Hide customize assembly from disconnected guide
jafiala Apr 30, 2026
5138d85
Apply suggestions from style review
jafiala May 5, 2026
d4609f5
Revert "Hide customize assembly from disconnected guide"
jafiala May 5, 2026
67068d4
Remove customize assembly from disconnected guide
jafiala May 5, 2026
f7d5a89
Restructure without nested assemblies
jafiala May 5, 2026
706eee0
Fix inline conditionals
jafiala May 5, 2026
781b475
Remove trailing whitespace
jafiala May 5, 2026
d3ba7b9
Make http proxy visible
jafiala May 6, 2026
46bc4d9
remove unverified foremanctl procs
jafiala May 7, 2026
abd632b
Omit deploying custom certs to host from foremanctl
jafiala May 7, 2026
ddaf373
Merge branch 'master' into add-additional-config-foremanctl-SAT-43780
jafiala May 7, 2026
7b6a30d
Fix endif syntax
jafiala May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions guides/common/assembly_configuring-satellite-custom-server-certificate.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::[]
4 changes: 4 additions & 0 deletions guides/common/assembly_configuring-satellite-with-an-http-proxy.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand All @@ -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]

Expand Down
3 changes: 0 additions & 3 deletions guides/common/assembly_customize-the-installation.adoc
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions guides/common/modules/con_customize-the-installation.adoc
View file
Open in desktop

This file was deleted.

7 changes: 5 additions & 2 deletions guides/common/modules/con_performing-additional-configuration.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
15 changes: 9 additions & 6 deletions guides/doc-Installing_Server/master.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,29 @@ 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]

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::[]
Expand All @@ -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]
Expand All @@ -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::[]
Copy link
Copy Markdown
Contributor

@maximiliankolb maximiliankolb May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not understand this line yet. I checked the built docs expecting that the ribbon is missing for foremanctl-katello, but it's still there as it should be. However, wouldn't it be easier to move line 102 to 95?

4 changes: 0 additions & 4 deletions guides/doc-Installing_Server_Disconnected/master.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
Loading