Skip to content

Commit 6973aee

Browse files
maximiliankolbmaximiliankolb
committed
Move content from assembly to dedicated files
1 parent 87fa013 commit 6973aee

5 files changed

+57
-54
lines changed

‎guides/common/assembly_installing-server-connected.adoc

+2-52
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,6 @@
11
ifdef::context[:parent-context: {context}]
22

3-
[id="Installing_Server_Connected_{context}"]
4-
= Installing {ProjectServer}
5-
6-
ifdef::satellite[]
7-
When you install {ProjectServer} from a connected network, you can obtain packages and receive updates directly from the Red Hat Content Delivery Network.
8-
9-
NOTE: You cannot register {ProjectServer} to itself.
10-
11-
Use the following procedures to install {ProjectServer}, perform the initial configuration, and import subscription manifests.
12-
For more information on subscription manifests, see {ContentManagementDocURL}Managing_Red_Hat_Subscriptions_content-management[Managing Red Hat Subscriptions] in _{ContentManagementDocTitle}_.
13-
endif::[]
14-
15-
ifndef::satellite[]
16-
Use the following procedures to install {ProjectServer} and perform the initial configuration.
17-
endif::[]
18-
19-
ifdef::foreman-el[]
20-
On {EL}, you can install {Project} with or without the Katello plug-in.
21-
If you are a new user, consider installing {Project} with the Katello plug-in.
22-
endif::[]
23-
24-
Note that the {Project} installation script is based on Puppet, which means that if you run the installation script more than once, it might overwrite any manual configuration changes.
25-
⁠
26-
To avoid this and determine which future changes apply, use the `--noop` argument when you run the installation script.
27-
This argument ensures that no actual changes are made.
28-
Potential changes are written to `{installer-log-file}`.
29-
30-
Files are always backed up and so you can revert any unwanted changes.
31-
For example, in the foreman-installer logs, you can see an entry similar to the following about Filebucket:
32-
33-
[options="wrap"]
34-
----
35-
/Stage[main]/Dhcp/File[/etc/dhcp/dhcpd.conf]: Filebucketed /etc/dhcp/dhcpd.conf to puppet with sum 622d9820b8e764ab124367c68f5fa3a1
36-
----
37-
38-
You can restore the previous file as follows:
39-
40-
[options="wrap"]
41-
----
42-
# puppet filebucket -l \
43-
restore /etc/dhcp/dhcpd.conf 622d9820b8e764ab124367c68f5fa3a1
44-
----
3+
include::modules/con_installing-server.adoc[]
454

465
ifdef::satellite,katello,orcharhino[]
476
include::modules/proc_configuring-http-proxy-to-connect-to-cdn.adoc[leveloffset=+1]
@@ -72,16 +31,7 @@ ifdef::satellite[]
7231
include::modules/proc_installing-the-sos-package.adoc[leveloffset=+1]
7332
endif::[]
7433

75-
[id="configuring-server_{context}"]
76-
== Configuring {ProjectServer}
77-
78-
Install {ProjectServer} using the `{foreman-installer}` installation script.
79-
80-
This method is performed by running the installation script with one or more command options.
81-
The command options override the corresponding default initial configuration options and are recorded in the {Project} answer file.
82-
You can run the script as often as needed to configure any necessary options.
83-
84-
NOTE: Depending on the options that you use when running the {Project} installer, the configuration can take several minutes to complete.
34+
include::modules/con_configuring-server.adoc[leveloffset=+1]
8535

8636
include::modules/proc_configuring-installation.adoc[leveloffset=+2]
8737

‎guides/common/modules/con_configuring-server.adoc

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[id="configuring-server_{context}"]
2+
= Configuring {ProjectServer}
3+
4+
Install {ProjectServer} using the `{foreman-installer}` installation script.
5+
6+
This method is performed by running the installation script with one or more command options.
7+
The command options override the corresponding default initial configuration options and are recorded in the {Project} answer file.
8+
You can run the script as often as needed to configure any necessary options.
9+
10+
NOTE: Depending on the options that you use when running the {Project} installer, the configuration can take several minutes to complete.

‎guides/common/modules/con_installing-server.adoc

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
[id="Installing_Server_Connected_{context}"]
2+
= Installing {ProjectServer}
3+
4+
ifdef::satellite[]
5+
When you install {ProjectServer} from a connected network, you can obtain packages and receive updates directly from the Red Hat Content Delivery Network.
6+
7+
NOTE: You cannot register {ProjectServer} to itself.
8+
9+
Use the following procedures to install {ProjectServer}, perform the initial configuration, and import subscription manifests.
10+
For more information on subscription manifests, see {ContentManagementDocURL}Managing_Red_Hat_Subscriptions_content-management[Managing Red Hat Subscriptions] in _{ContentManagementDocTitle}_.
11+
endif::[]
12+
13+
ifndef::satellite[]
14+
Use the following procedures to install {ProjectServer} and perform the initial configuration.
15+
endif::[]
16+
17+
ifdef::foreman-el[]
18+
On {EL}, you can install {Project} with or without the Katello plug-in.
19+
If you are a new user, consider installing {Project} with the Katello plug-in.
20+
endif::[]
21+
22+
Note that the {Project} installation script is based on Puppet, which means that if you run the installation script more than once, it might overwrite any manual configuration changes.
23+
⁠
24+
To avoid this and determine which future changes apply, use the `--noop` argument when you run the installation script.
25+
This argument ensures that no actual changes are made.
26+
Potential changes are written to `{installer-log-file}`.
27+
28+
Files are always backed up and so you can revert any unwanted changes.
29+
For example, in the foreman-installer logs, you can see an entry similar to the following about Filebucket:
30+
31+
[options="wrap"]
32+
----
33+
/Stage[main]/Dhcp/File[/etc/dhcp/dhcpd.conf]: Filebucketed /etc/dhcp/dhcpd.conf to puppet with sum 622d9820b8e764ab124367c68f5fa3a1
34+
----
35+
36+
You can restore the previous file as follows:
37+
38+
[options="wrap"]
39+
----
40+
# puppet filebucket -l \
41+
restore /etc/dhcp/dhcpd.conf 622d9820b8e764ab124367c68f5fa3a1
42+
----

‎guides/common/modules/con_performing-additional-configuration.adoc

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[id="performing-additional-configuration-on-server_{context}"]
2+
= Performing Additional Configuration on {ProjectServer}

‎guides/doc-Installing_Server/master.adoc

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ include::common/assembly_preparing-environment-for-installation-in-ipv6-network.
2323

2424
include::common/assembly_installing-server-connected.adoc[leveloffset=+1]
2525

26-
[id="performing-additional-configuration"]
27-
== Performing Additional Configuration on {ProjectServer}
26+
include::common/modules/con_performing-additional-configuration.adoc[leveloffset=+1]
2827

2928
ifdef::satellite[]
3029
include::common/modules/proc_using-insights-with-satellite-server.adoc[leveloffset=+2]

0 commit comments

Comments
 (0)