Skip to content

Commit

Permalink
Implement repository configuration with asciidoctor-tabs
Browse files Browse the repository at this point in the history
Rather than two procedures below eachother, this implements tabs. That
makes the overall page shorter while still obvious.
  • Loading branch information
ekohl committed Jul 2, 2024
1 parent 5c617e6 commit 2b23ea8
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 29 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
source 'https://rubygems.org'

gem 'asciidoctor'
gem 'asciidoctor-tabs'
gem 'sass'

# For TOC generation
Expand Down
2 changes: 1 addition & 1 deletion guides/common/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ $(IMAGES_TS): $(IMAGES)
@touch $(IMAGES_TS)

$(DEST_HTML): $(SOURCES) $(DEPENDENCIES) $(DOCINFO_SOURCES) $(DEST_DIR)/$(BUILD).css $(IMAGES_TS)
bundle exec asciidoctor -a build=$(BUILD) $(BASEURL_ATTR) -a docinfo=shared -a docinfodir=common -a date_mdy="$(DATE_MDY)" -a date_my="$(DATE_MY)" -a docdatetime="$(DATE_MY)" -a stylesheet=$(DEST_DIR)/$(BUILD).css -a attribute-missing=warn -b html5 -d book --trace -o $@ $< 2>&1 | tee $@.log 1>&2
bundle exec asciidoctor -r asciidoctor-tabs -a build=$(BUILD) $(BASEURL_ATTR) -a docinfo=shared -a docinfodir=common -a date_mdy="$(DATE_MDY)" -a date_my="$(DATE_MY)" -a docdatetime="$(DATE_MY)" -a stylesheet=$(DEST_DIR)/$(BUILD).css -a attribute-missing=warn -b html5 -d book --trace -o $@ $< 2>&1 | tee $@.log 1>&2
@echo CHECKING FOR ASCIIDOCTOR ERRORS AND WARNINGS
@! grep -Eq "^asciidoctor: (ERROR|WARNING)" $@.log
@echo CHECKING FOR ORPHAN XREFS HTML LINKS
Expand Down
50 changes: 22 additions & 28 deletions guides/common/modules/proc_configuring-repositories.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,13 @@ endif::[]

ifndef::orcharhino[]
.Procedure
Select the operating system and version you are installing on:
endif::[]

ifdef::foreman-el,katello,satellite[]
* xref:#repositories-el-9[{EL} 9]
* xref:#repositories-el-8[{EL} 8]
endif::[]
ifdef::foreman-deb[]
* xref:#repositories-debian-11[Debian 11 (Bullseye)]
* xref:#repositories-ubuntu-2004[Ubuntu 20.04 (Focal)]
* xref:#repositories-ubuntu-2204[Ubuntu 22.04 (Jammy)]
endif::[]

ifdef::foreman-el,katello,satellite[]
[id="repositories-el-9"]
== {EL} 9

[tabs]
=====
{EL} 9::
+
ifdef::satellite[]
. Disable all repositories:
+
Expand Down Expand Up @@ -51,11 +41,8 @@ ifdef::foreman-el,katello[]
include::proc_configuring-repositories-el.adoc[]
endif::[]
include::snip_verification-enabled-repolist.adoc[]

[id="repositories-el-8"]
== {EL} 8

{EL} 8::
+
ifdef::satellite[]
. Disable all repositories:
+
Expand Down Expand Up @@ -103,26 +90,33 @@ ifeval::["{context}" != "{project-context}"]
endif::[]
For more information about modules and lifecycle streams on {RHEL} 8, see https://access.redhat.com/support/policy/updates/rhel-app-streams-life-cycle[{RHEL} Application Streams Lifecycle].
====
=====

include::snip_verification-enabled-repolist.adoc[]
endif::[]

ifdef::foreman-deb[]
[id="repositories-debian-11"]
== Debian 11 (Bullseye)

[tabs]
=====
Debian 11 (Bullseye)::
+
--
:distribution-codename: bullseye
include::proc_configuring-repositories-deb.adoc[]
--
[id="repositories-ubuntu-2004"]
== Ubuntu 20.04 (Focal)

Ubuntu 20.04 (Focal)::
+
--
:distribution-codename: focal
include::proc_configuring-repositories-deb.adoc[]
--
[id="repositories-ubuntu-2204"]
== Ubuntu 22.04 (Jammy)

Ubuntu 22.04 (Jammy)::
+
--
:distribution-codename: jammy
include::proc_configuring-repositories-deb.adoc[]
--
=====
endif::[]

0 comments on commit 2b23ea8

Please sign in to comment.