79752652c5
- Fix documentation for Pacemaker Remote schema transfers - Do not check CIB feature set version when CIB_file is set - Consolidate attrd cache handling - Avoid duplicating option metadata across daemons - Related: RHEL-7597 - Related: RHEL-14045
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
From a3bffc7c66bf6f796f977cffd44f223635b008c5 Mon Sep 17 00:00:00 2001
|
|
From: Reid Wahl <nrwahl@protonmail.com>
|
|
Date: Wed, 20 Dec 2023 13:33:47 -0800
|
|
Subject: [PATCH] Doc: Pacemaker Explained: Add replace for
|
|
PCMK__REMOTE_SCHEMA_DIR
|
|
|
|
So that the existing use in local-options.rst expands correctly.
|
|
|
|
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
|
|
---
|
|
doc/sphinx/Makefile.am | 1 +
|
|
doc/sphinx/conf.py.in | 1 +
|
|
3 files changed, 2 insertions(+)
|
|
create mode 100644 doc/sphinx/conf.py.in.rej
|
|
|
|
diff --git a/doc/sphinx/Makefile.am b/doc/sphinx/Makefile.am
|
|
index e48e19a..d0309ff 100644
|
|
--- a/doc/sphinx/Makefile.am
|
|
+++ b/doc/sphinx/Makefile.am
|
|
@@ -134,6 +134,7 @@ $(BOOKS:%=%/conf.py): conf.py.in
|
|
-e 's#%CRM_SCHEMA_DIRECTORY%#@CRM_SCHEMA_DIRECTORY@#g' \
|
|
-e 's#%PACEMAKER_CONFIG_DIR%#@PACEMAKER_CONFIG_DIR@#g' \
|
|
-e 's#%PCMK_GNUTLS_PRIORITIES%#@PCMK_GNUTLS_PRIORITIES@#g' \
|
|
+ -e 's#%PCMK__REMOTE_SCHEMA_DIR%#@PCMK__REMOTE_SCHEMA_DIR@#g' \
|
|
$(<) > "$@"
|
|
|
|
$(BOOK)/_build: $(STATIC_FILES) $(BOOK)/conf.py $(DEPS_$(BOOK)) $(wildcard $(srcdir)/$(BOOK)/*.rst)
|
|
diff --git a/doc/sphinx/conf.py.in b/doc/sphinx/conf.py.in
|
|
index 556eb72..511f029 100644
|
|
--- a/doc/sphinx/conf.py.in
|
|
+++ b/doc/sphinx/conf.py.in
|
|
@@ -40,6 +40,7 @@ rst_prolog="""
|
|
.. |PCMK_INIT_ENV_FILE| replace:: ``%PACEMAKER_CONFIG_DIR%/pcmk-init.env``
|
|
.. |PCMK_LOG_FILE| replace:: %CRM_LOG_DIR%/pacemaker.log
|
|
.. |PCMK_GNUTLS_PRIORITIES| replace:: %PCMK_GNUTLS_PRIORITIES%
|
|
+.. |PCMK__REMOTE_SCHEMA_DIR| replace:: %PCMK__REMOTE_SCHEMA_DIR%
|
|
.. |REMOTE_DISTRO| replace:: AlmaLinux
|
|
.. |REMOTE_DISTRO_VER| replace:: 9
|
|
"""
|
|
--
|
|
2.31.1
|
|
|