From d00c0c67d0bc7cb51ddd11bcca1d2f89a8822a3f Mon Sep 17 00:00:00 2001
From: Ian Barwick <barwick@gmail.com>
Date: Fri, 29 Jun 2018 17:00:25 +0900
Subject: [PATCH] repmgrd: document PID file options/configuration

---
 HISTORY                         |  3 ++-
 doc/appendix-release-notes.sgml | 34 ++++++++++++++++++++++++
 doc/repmgrd-configuration.sgml  | 46 ++++++++++++++++++++++++++++++++-
 3 files changed, 81 insertions(+), 2 deletions(-)

diff --git a/HISTORY b/HISTORY
index 2670eb7d..a5553fe0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,6 @@
 4.1.0   2018-??-??
-		repmgr: add "--missing-slots" check to "repmgr node check"
+		repmgr: add "--missing-slots" check to "repmgr node check" (Ian)
+        repmgrd: create a PID file by default; GitHub #457 (Ian)
 
 4.0.6   2018-06-14
         repmgr: (witness register) prevent registration of a witness server with the
diff --git a/doc/appendix-release-notes.sgml b/doc/appendix-release-notes.sgml
index 0e387546..9b8b8c26 100644
--- a/doc/appendix-release-notes.sgml
+++ b/doc/appendix-release-notes.sgml
@@ -15,6 +15,40 @@
     See also: <xref linkend="upgrading-repmgr">
   </para>
 
+  <sect1 id="release-4.1.0">
+    <title>Release 4.1.0</title>
+    <para><emphasis>???? ??, 2018</emphasis></para>
+    <para>
+      &repmgr; 4.1.0 introduces some changes to <application>repmgrd</application>
+      behaviour and some additional configuration parameters.
+    </para>
+    <para>
+      &repmgr; 4.1.0 introduces changes to the &repmgr; extension schema, meaning
+      <command>ALTER EXTENSION repmgr UPGRADE</command> must be executed after
+      installing the new version.
+    </para>
+    <para>
+      Configuration changes are backwards-compatible and no changes to
+      <filename>repmgr.conf</filename> are required. However users should
+      review changes listed below.
+    </para>
+
+    <sect2>
+      <title>repmgrd enhancements</title>
+      <para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <application>repmgrd</application>: create a PID file by default
+              (GitHub #457). For details, see <xref linkend="repmgrd-pid-file">.
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </para>
+    </sect2>
+  </sect1>
+
   <sect1 id="release-4.0.6">
     <title>Release 4.0.6</title>
     <para><emphasis>June 14, 2018</emphasis></para>
diff --git a/doc/repmgrd-configuration.sgml b/doc/repmgrd-configuration.sgml
index 7f046d47..7463215e 100644
--- a/doc/repmgrd-configuration.sgml
+++ b/doc/repmgrd-configuration.sgml
@@ -24,7 +24,7 @@
 
     <para>
       To use <application>repmgrd</application>, its associated function library <emphasis>must</emphasis> be
-      included in <filename>postgresql.conf</filename> with:
+      included via <filename>postgresql.conf</filename> with:
 
       <programlisting>
         shared_preload_libraries = 'repmgr'</programlisting>
@@ -170,6 +170,50 @@
       running <application>repmgrd</application> daemon.
     </para>
 
+    <sect2 id="repmgrd-pid-file">
+      <indexterm>
+        <primary>repmgrd</primary>
+        <secondary>PID file</secondary>
+      </indexterm>
+      <title>repmgrd's PID file</title>
+      <para>
+        <application>repmgrd</application> will generate a PID file by default.
+      </para>
+      <note>
+        <simpara>
+          This is a behaviour change from previous versions (earlier than 4.1), where
+          the PID file had to be explicitly specified with the command line
+          parameter <option> --pid-file</option>.
+        </simpara>
+      </note>
+      <para>
+        The PID file can be specified in <filename>repmgr.conf</filename> with the configuration
+        parameter <varname>repmgrd_pid_file</varname>.
+      </para>
+      <para>
+        It can also be specified on the command line (as in previous versions) with
+        the command line parameter <option>--pid-file</option>. Note this will override
+        any value set in <filename>repmgr.conf</filename> with <varname>repmgrd_pid_file</varname>.
+        <option>--pid-file</option> may be deprecated in future releases.
+      </para>
+      <para>
+        If no PID file is specified, <application>repmgrd</application> will create one
+        in the operating system's temporary directory (determined by the environment variable
+        <varname>TMPDIR</varname>, or if that is not set, will use <filename>/tmp</filename>.
+      </para>
+      <para>
+        To prevent a PID file being generated at all, provide the command line option
+        <option>--no-pid-file</option>.
+      </para>
+      <para>
+        To see which PID file would use, execute <application>repmgrd</application>
+        with the option <option>--show-pid-file</option>. <application>repmgrd</application>
+        will not start if this option is provided. Note that the value shown is the
+        file  <application>repmgrd</application> would use next time it starts, and is
+        not necessarily the PID file currently in use.
+      </para>
+    </sect2>
+
     <sect2 id="repmgrd-configuration-debian-ubuntu">
       <indexterm>
         <primary>repmgrd</primary>