theforeman · Lennonka · Dec 16, 2024 · Dec 16, 2024 · Dec 16, 2024 · Dec 18, 2024
diff --git a/guides/common/assembly_configuring-external-services.adoc b/guides/common/assembly_configuring-external-services.adoc
@@ -6,15 +6,9 @@ include::modules/proc_configuring-external-dns.adoc[leveloffset=+1]
 
 include::assembly_configuring-external-dhcp.adoc[leveloffset=+1]
 
-ifeval::[ "{context}" == "{project-context}" ]
-include::assembly_using-infoblox-as-dhcp-and-dns-providers.adoc[leveloffset=+1]
-endif::[]
-
 include::modules/proc_configuring-external-tftp.adoc[leveloffset=+1]
 
 include::assembly_configuring-external-idm-dns.adoc[leveloffset=+1]
 
-include::assembly_configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm.adoc[leveloffset=+1]
-
 ifdef::parent-context[:context: {parent-context}]
 ifndef::parent-context[:!context:]
diff --git a/.../common/assembly_performing-additional-configuration-on-smart-proxy-server.adoc b/.../common/assembly_performing-additional-configuration-on-smart-proxy-server.adoc
@@ -23,6 +23,3 @@ endif::[]
 
 // Enabling Power Management on Hosts
 include::modules/proc_enabling-power-management-on-hosts.adoc[leveloffset=+1]
-
-// Configuring DNS, DHCP, and TFTP on {SmartProxyServer}
-include::modules/proc_configuring-dns-dhcp-and-tftp.adoc[leveloffset=+1]
diff --git a/guides/common/attributes-base.adoc b/guides/common/attributes-base.adoc
@@ -2,6 +2,7 @@
 :BaseFilenameURL: index-{build}.html
 :AdministeringDocURL: {BaseURL}Administering_Project/{BaseFilenameURL}#
 :APIDocURL: {BaseURL}Project_API/{BaseFilenameURL}#
+:ConfiguringDNSDHCPTFTPDocURL: {BaseURL}Configuring_DNS_DHCP_TFTP/{BaseFilenameURL}#
 :ConfiguringLoadBalancerDocURL: {BaseURL}Configuring_Load_Balancer/{BaseFilenameURL}#
 :ConfiguringUserAuthenticationDocURL: {BaseURL}Configuring_User_Authentication/{BaseFilenameURL}#
 :ContentManagementDocURL: {BaseURL}Managing_Content/{BaseFilenameURL}#

diff --git a/guides/common/attributes-satellite.adoc b/guides/common/attributes-satellite.adoc
@@ -14,6 +14,7 @@
 // - downstream_filename_to_link.json in downstream
 :AdministeringDocURL: {BaseURL}administering_red_hat_satellite/index#
 :APIDocURL: {BaseURL}using_the_satellite_rest_api/index#
+:ConfiguringDNSDHCPTFTPDocURL: {BaseURL}configuring_dns_dhcp_and_tftp_integration/index#
 :ConfiguringLoadBalancerDocURL: {BaseURL}configuring_capsules_with_a_load_balancer/index#
 :ConfiguringUserAuthenticationDocURL: {BaseURL}configuring_authentication_for_red_hat_satellite_users/index#
 :ContentManagementDocURL: {BaseURL}managing_content/index#

diff --git a/guides/common/attributes-titles.adoc b/guides/common/attributes-titles.adoc
@@ -4,6 +4,7 @@
 :AdministeringAnsibleDocTitle: Managing {Project} with Ansible
 :APIDocTitle: Using the {Project} REST API
 :AppCentricDeploymentDocTitle: Deploying hosts by using application centric approach
+:ConfiguringDNSDHCPTFTPDocTitle: Configuring DNS, DHCP, and TFTP integration
 :ConfiguringLoadBalancerDocTitle: Configuring {SmartProxies} with a load balancer
 :ConfiguringUserAuthenticationDocTitle: Configuring authentication for {ProjectName} users
 :ContentManagementDocTitle: Managing content

diff --git a/guides/common/modules/con_configuring-dns-dhcp-and-tftp.adoc b/guides/common/modules/con_configuring-dns-dhcp-and-tftp.adoc
@@ -1,4 +1,4 @@
-[id="configuring-dns-dhcp-and-tftp_{context}"]
+[id="configuring-dns-dhcp-and-tftp"]
 = Configuring DNS, DHCP, and TFTP
 
 You can manage DNS, DHCP, and TFTP centrally within the {Project} environment, or you can manage them independently after disabling their maintenance on {Project}.

diff --git a/guides/common/modules/con_configuring-project-with-external-dhcp.adoc b/guides/common/modules/con_configuring-project-with-external-dhcp.adoc
@@ -1,4 +1,4 @@
-[id="configuring-external-dhcp_{context}"]
+[id="configuring-external-dhcp"]
 = Configuring {ProductName} with external DHCP
 
 To configure {ProductName} with external DHCP, you must complete the following procedures:

diff --git a/guides/common/modules/con_managing-dhcp-by-using-smartproxy.adoc b/guides/common/modules/con_managing-dhcp-by-using-smartproxy.adoc
@@ -7,11 +7,11 @@ You can use the DHCP module of {SmartProxy} to query for available IP addresses,
 Note that your {SmartProxy} cannot manage subnet declarations.
 
 .Available DHCP providers
-* `dhcp_infoblox` {endash} For more information, see xref:Using_Infoblox_as_DHCP_and_DNS_Providers_{smart-proxy-context}[].
+* `dhcp_infoblox` {endash} For more information, see xref:Using_Infoblox_as_DHCP_and_DNS_Providers[].
 * `dhcp_isc` {endash} ISC DHCP server over OMAPI.
-For more information, see xref:configuring-dns-dhcp-and-tftp-on-productname_{smart-proxy-context}[].
+For more information, see xref:configuring-dns-dhcp-and-tftp[].
 * `dhcp_remote_isc` {endash} ISC DHCP server over OMAPI with leases mounted through networking.
-For more information, see xref:configuring-external-dhcp_{smart-proxy-context}[].
+For more information, see xref:configuring-external-dhcp[].
 ifndef::satellite[]
 * `dhcp_libvirt` {endash} dnsmasq DHCP via libvirt API
 endif::[]

diff --git a/guides/common/modules/con_managing-dns-by-using-smartproxy.adoc b/guides/common/modules/con_managing-dns-by-using-smartproxy.adoc
@@ -12,7 +12,7 @@ Other providers provide more direct integration, such as `dns_infoblox` for http
 ifdef::orcharhino[]
 * `dns_dnscmd` {endash} Static DNS records in Microsoft Active Directory.
 endif::[]
-* `dhcp_infoblox` {endash} For more information, see xref:Using_Infoblox_as_DHCP_and_DNS_Providers_{smart-proxy-context}[].
+* `dhcp_infoblox` {endash} For more information, see xref:Using_Infoblox_as_DHCP_and_DNS_Providers[].
 ifndef::satellite[]
 * `dns_libvirt` {endash} Dnsmasq DNS via libvirt API.
 For more information, see xref:configuring_dns_libvirt_{context}[].

diff --git a/guides/common/modules/con_using-infoblox-as-dhcp-and-dns-providers.adoc b/guides/common/modules/con_using-infoblox-as-dhcp-and-dns-providers.adoc
@@ -1,4 +1,4 @@
-[id="Using_Infoblox_as_DHCP_and_DNS_Providers_{context}"]
+[id="Using_Infoblox_as_DHCP_and_DNS_Providers"]
 = Using Infoblox as DHCP and DNS providers
 
 You can use {ProductName} to connect to your Infoblox application to create and manage DHCP and DNS records, and to reserve IP addresses.

diff --git a/guides/doc-Configuring_DNS_DHCP_TFTP/Makefile b/guides/doc-Configuring_DNS_DHCP_TFTP/Makefile
@@ -0,0 +1 @@
+include ../common/Makefile
diff --git a/guides/doc-Configuring_DNS_DHCP_TFTP/common b/guides/doc-Configuring_DNS_DHCP_TFTP/common
@@ -0,0 +1 @@
+../common
diff --git a/guides/doc-Configuring_DNS_DHCP_TFTP/docinfo.html b/guides/doc-Configuring_DNS_DHCP_TFTP/docinfo.html
@@ -0,0 +1 @@
+../common/docinfo.html
diff --git a/guides/doc-Configuring_DNS_DHCP_TFTP/docinfo.xml b/guides/doc-Configuring_DNS_DHCP_TFTP/docinfo.xml
@@ -0,0 +1,19 @@
+<title>{ConfiguringDNSDHCPTFTPDocTitle}</title>
+<productname>Red Hat Satellite</productname>
+<productnumber>{ProjectVersion}</productnumber>
+<subtitle>Administer network services, such as DNS, DHCP, and TFTP</subtitle>
+<abstract>
+
+    <para>
+    TODO
+    </para>
+
+</abstract>
+<authorgroup id="Author_Group">
+        <author>
+                <firstname>Red Hat Satellite</firstname>
+                <surname>Documentation Team</surname>
+                <email>[email protected]</email>
+        </author>
+</authorgroup>
+<xi:include href="Common_Content/Legal_Notice.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/guides/doc-Configuring_DNS_DHCP_TFTP/images/common b/guides/doc-Configuring_DNS_DHCP_TFTP/images/common
@@ -0,0 +1 @@
+../common/images
diff --git a/guides/doc-Configuring_DNS_DHCP_TFTP/master.adoc b/guides/doc-Configuring_DNS_DHCP_TFTP/master.adoc
@@ -0,0 +1,28 @@
+include::common/attributes.adoc[]
+include::common/header.adoc[]
+:context: admin-network
+:admin-network:
+
+= {ConfiguringDNSDHCPTFTPDocTitle}
+
+// This guide is not ready for stable releases
+ifdef::HideDocumentOnStable[]
+include::common/modules/snip_guide-not-ready.adoc[]
+endif::[]
+ifndef::HideDocumentOnStable[]
+
+ifdef::satellite[]
+include::common/modules/proc_providing-feedback-on-red-hat-documentation.adoc[leveloffset=+1]
+endif::[]
+
+:ProductName: {SmartProxy}
+include::common/assembly_configuring-dns-dhcp-and-tftp.adoc[leveloffset=+1]
+
+include::common/assembly_configuring-external-services.adoc[leveloffset=+1]
+
+include::common/assembly_managing-dhcp-on-smart-proxies.adoc[leveloffset=+1]
+
+include::common/assembly_managing-dns-on-smart-proxies.adoc[leveloffset=+1]
+
+include::common/assembly_using-infoblox-as-dhcp-and-dns-providers.adoc[leveloffset=+1]
+endif::[]
diff --git a/guides/doc-Installing_Proxy/master.adoc b/guides/doc-Installing_Proxy/master.adoc
@@ -26,15 +26,6 @@ include::common/assembly_installing-capsule-server.adoc[leveloffset=+1]
 
 include::common/assembly_performing-additional-configuration-on-smart-proxy-server.adoc[leveloffset=+1]
 
-// Configuring {SmartProxyServer} with External Services
-include::common/assembly_configuring-external-services.adoc[leveloffset=+1]
-
-include::common/assembly_managing-dhcp-on-smart-proxies.adoc[leveloffset=+1]
-
-include::common/assembly_managing-dns-on-smart-proxies.adoc[leveloffset=+1]
-
-include::common/assembly_using-infoblox-as-dhcp-and-dns-providers.adoc[leveloffset=+1]
-
 :numbered!:
 
 // {SmartProxyServer} Scalability Considerations

diff --git a/guides/doc-Installing_Server/master.adoc b/guides/doc-Installing_Server/master.adoc
@@ -45,10 +45,10 @@ include::common/assembly_configuring-satellite-with-an-http-proxy.adoc[leveloffs
 
 include::common/modules/proc_enabling-power-management-on-hosts.adoc[leveloffset=+2]
 
-include::common/assembly_configuring-dns-dhcp-and-tftp.adoc[leveloffset=+2]
-
 include::common/modules/proc_configuring-satellite-for-outgoing-emails.adoc[leveloffset=+2]
 
+include::common/assembly_configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm.adoc[leveloffset=+2]
+
 ifdef::katello,orcharhino,satellite[]
 include::common/assembly_configuring-an-alternate-cname.adoc[leveloffset=+2]
 
@@ -59,8 +59,6 @@ include::common/modules/proc_resetting-custom-ssl-certificate-to-default-self-si
 include::common/assembly_using-external-databases.adoc[leveloffset=+2]
 endif::[]
 
-include::common/assembly_configuring-external-services.adoc[leveloffset=+1]
-
 :numbered!:
 
 ifdef::katello[]

diff --git a/guides/doc-Installing_Server_Disconnected/master.adoc b/guides/doc-Installing_Server_Disconnected/master.adoc
@@ -30,19 +30,16 @@ include::common/modules/proc_configuring-pull-based-transport-for-remote-executi
 
 include::common/modules/proc_enabling-power-management-on-hosts.adoc[leveloffset=+2]
 
-include::common/assembly_configuring-dns-dhcp-and-tftp.adoc[leveloffset=+2]
-
 include::common/modules/proc_configuring-satellite-for-outgoing-emails.adoc[leveloffset=+2]
 
+include::common/assembly_configuring-project-to-manage-the-lifecycle-of-a-host-registered-to-a-freeipa-realm.adoc[leveloffset=+2]
+
 ifdef::katello,orcharhino,satellite[]
 include::common/assembly_configuring-satellite-custom-server-certificate.adoc[leveloffset=+2]
 
 include::common/assembly_using-external-databases.adoc[leveloffset=+2]
 endif::[]
 
-
-include::common/assembly_configuring-external-services.adoc[leveloffset=+1]
-
 :numbered!:
 
 [appendix]