From 0d4de0ef46eb8117d0a45d99e561fc68d8e370f7 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Sat, 9 Jul 2022 18:26:16 +0200 Subject: [PATCH] Doc: man: make config location configurable --- man/Makefile.am | 2 +- man/sbd.8.pod.in | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am index ae4c14a..13adb23 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -6,7 +6,7 @@ sbd.sysconfig.pod: ../src/sbd.sysconfig sed -r -n -e "s/^## Type: (.*)/Allows C<\1>/;t type;s/^## Default: (.*)/ defaulting to C<\1>/;t default;s/^#*(.*)=.*/=item B<\1>\n/;t variable;s/^#*//;s/^ *//;H;d;:type;h;d;:default;H;x;s/\n//;x;d;:variable;G;p" $< > $@ sbd.8.pod: sbd.8.pod.in sbd.sysconfig.pod - sed -e "s,\@runstatedir\@,$(runstatedir)," $< |sed -e "s/@environment_section@//;t insert;p;d;:insert;rsbd.sysconfig.pod" > $@ + sed -e "s,\@runstatedir\@,$(runstatedir),;s,\@configdir\@,$(CONFIGDIR)," $< |sed -e "s/@environment_section@//;t insert;p;d;:insert;rsbd.sysconfig.pod" > $@ sbd.8: sbd.8.pod @POD2MAN@ -s 8 -c "STONITH Block Device" -r "SBD" -n "SBD" $< $@ diff --git a/man/sbd.8.pod.in b/man/sbd.8.pod.in index 21b3834..54fdabb 100644 --- a/man/sbd.8.pod.in +++ b/man/sbd.8.pod.in @@ -28,7 +28,7 @@ C parameter; some of these modes take additional parameters. To use SBD with shared storage, you must first C the messaging layout on one to three block devices. Second, configure -F to list those devices (and possibly adjust other +F<@configdir@/sbd> to list those devices (and possibly adjust other options), and restart the cluster stack on each node to ensure that C is started. Third, configure the C fencing resource in the Pacemaker CIB. @@ -181,7 +181,7 @@ C B be started on boot before the cluster stack! See below for enabling this according to your boot environment. The options for this mode are rarely specified directly on the -commandline directly, but most frequently set via F. +commandline directly, but most frequently set via F<@configdir@/sbd>. It also constantly monitors connectivity to the storage device, and self-fences in case the partition becomes unreachable, guaranteeing that it @@ -560,7 +560,7 @@ without SBD supervision. =head2 Configuration via sysconfig -The system instance of C is configured via F. +The system instance of C is configured via F<@configdir@/sbd>. In this file, you must specify the device(s) used, as well as any options to pass to the daemon: @@ -593,7 +593,7 @@ The node will acknowledge the receipt of the message in the system logs: This confirms that SBD is indeed up and running on the node, and that it is ready to receive messages. -Make B that F is identical on all cluster +Make B that F<@configdir@/sbd> is identical on all cluster nodes, and that all cluster nodes are running the daemon. =head1 Pacemaker CIB integration @@ -608,7 +608,7 @@ follows: params pcmk_delay_max=30 This will automatically use the same devices as configured in -F. +F<@configdir@/sbd>. While you should not configure this as a clone (as Pacemaker will register the fencing device on each node automatically), the I