Blame SOURCES/0013-Extend-man-pages-with-systemd-info.patch

bd689f
From 813a4bc45d45f4af94c699893cb2d2ba998d5d31 Mon Sep 17 00:00:00 2001
bd689f
From: Martin Sehnoutka <msehnout@redhat.com>
bd689f
Date: Wed, 7 Sep 2016 11:53:07 +0200
bd689f
Subject: [PATCH 13/59] Extend man pages with systemd info.
bd689f
bd689f
Man pages now reflect how is vsftpd used as
bd689f
systemd service.
bd689f
---
bd689f
 vsftpd.8      | 24 ++++++++++++++++++++++++
bd689f
 vsftpd.conf.5 | 18 +++++++++++++++++-
bd689f
 2 files changed, 41 insertions(+), 1 deletion(-)
bd689f
bd689f
diff --git a/vsftpd.8 b/vsftpd.8
bd689f
index c920e7d..fbeb1a2 100644
bd689f
--- a/vsftpd.8
bd689f
+++ b/vsftpd.8
bd689f
@@ -25,6 +25,23 @@ in
bd689f
 Direct execution of the
bd689f
 .Nm vsftpd
bd689f
 binary will then launch the FTP service ready for immediate client connections.
bd689f
+.Pp
bd689f
+Systemd changes the vsftpd daemon start-up. The vsftpd package contains vsftpd-generator script generating symbolic links to /var/run/systemd/generator/vsftpd.target.wants directory. The generator is called during e.g. 'systemctl --system daemon-reload'. All these symbolic links link /usr/lib/systemd/system/vsftpd@.service file.
bd689f
+The vsftpd daemon(s) is/are controlled by one of following ways:
bd689f
+.Pp
bd689f
+1. Single daemon using default /etc/vsftpd/vsftpd.conf configuration file
bd689f
+.br
bd689f
+# systemctl {start,stop,...} vsftpd[.service]
bd689f
+.Pp
bd689f
+2. Single daemon using /etc/vsftpd/<conf-name>.conf
bd689f
+.br
bd689f
+# systemctl {start,stop,...} vsftpd@<conf-name>[.service]
bd689f
+.Pp
bd689f
+3. All instances together
bd689f
+.br
bd689f
+# systemctl {restart,stop} vsftpd.target
bd689f
+.Pp
bd689f
+See systemd.unit(5), systemd.target(5) for further details.
bd689f
 .Sh OPTIONS
bd689f
 An optional
bd689f
 configuration file or files
bd689f
@@ -55,6 +72,13 @@ the "ftpd_banner" setting is set to "blah", which overrides any default vsftpd
bd689f
 setting and any identical setting that was in the config file.
bd689f
 .Sh FILES
bd689f
 .Pa /etc/vsftpd/vsftpd.conf
bd689f
+.Pp
bd689f
+.Pa /usr/lib/systemd/system/vsftpd.service
bd689f
+.Pp
bd689f
+.Pa /usr/lib/systemd/system/vsftpd@.service
bd689f
+.Pp
bd689f
+.Pa /usr/lib/systemd/system/vsftpd.target
bd689f
 .Sh SEE ALSO
bd689f
 .Xr vsftpd.conf 5
bd689f
+.Xr systemd.unit 5
bd689f
 .end
bd689f
diff --git a/vsftpd.conf.5 b/vsftpd.conf.5
bd689f
index 9d767b1..0744f85 100644
bd689f
--- a/vsftpd.conf.5
bd689f
+++ b/vsftpd.conf.5
bd689f
@@ -12,7 +12,23 @@ inetd such as
bd689f
 .BR xinetd
bd689f
 to launch vsftpd with different configuration files on a per virtual host
bd689f
 basis.
bd689f
-
bd689f
+.P
bd689f
+Systemd changes the vsftpd daemon start-up. The vsftpd package contains vsftpd-generator script generating symbolic links to /var/run/systemd/generator/vsftpd.target.wants directory. The generator is called during e. g. 'systemctl --system daemon-reload'. All these symbolic links link /usr/lib/systemd/system/vsftpd@.service file.
bd689f
+The vsftpd daemon(s) is/are controlled by one of following ways:
bd689f
+.P
bd689f
+1. Single daemon using default /etc/vsftpd/vsftpd.conf configuration file
bd689f
+.br
bd689f
+# systemctl {start,stop,...} vsftpd[.service]
bd689f
+.P
bd689f
+2. Single daemon using /etc/vsftpd/<config-filename>.conf
bd689f
+.br
bd689f
+# systemctl {start,stop,...} vsftpd@<config-filename-without-extension>[.service]
bd689f
+.P
bd689f
+3. All instances together
bd689f
+.br
bd689f
+# systemctl {restart,stop} vsftpd.target
bd689f
+.P
bd689f
+See systemd.unit(5), systemd.target(5) for further details.
bd689f
 .SH FORMAT
bd689f
 The format of vsftpd.conf is very simple. Each line is either a comment or
bd689f
 a directive. Comment lines start with a # and are ignored. A directive line
bd689f
-- 
bd689f
2.14.4
bd689f