Blame SOURCES/vsftpd-2.3.4-sd.patch

bd78b8
diff -up vsftpd-3.0.2/vsftpd.8.sd vsftpd-3.0.2/vsftpd.8
bd78b8
--- vsftpd-3.0.2/vsftpd.8.sd	2013-09-04 13:04:40.383348837 +0200
bd78b8
+++ vsftpd-3.0.2/vsftpd.8	2013-09-04 13:45:00.370277842 +0200
bd78b8
@@ -25,6 +25,23 @@ in
bd78b8
 Direct execution of the
bd78b8
 .Nm vsftpd
bd78b8
 binary will then launch the FTP service ready for immediate client connections.
bd78b8
+.Pp
bd78b8
+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.
bd78b8
+The vsftpd daemon(s) is/are controlled by one of following ways:
bd78b8
+.Pp
bd78b8
+1. Single daemon using default /etc/vsftpd/vsftpd.conf configuration file
bd78b8
+.br
bd78b8
+# systemctl {start,stop,...} vsftpd[.service]
bd78b8
+.Pp
bd78b8
+2. Single daemon using /etc/vsftpd/<conf-name>.conf
bd78b8
+.br
bd78b8
+# systemctl {start,stop,...} vsftpd@<conf-name>[.service]
bd78b8
+.Pp
bd78b8
+3. All instances together
bd78b8
+.br
bd78b8
+# systemctl {restart,stop} vsftpd.target
bd78b8
+.Pp
bd78b8
+See systemd.unit(5), systemd.target(5) for further details.
bd78b8
 .Sh OPTIONS
bd78b8
 An optional
bd78b8
 configuration file or files
bd78b8
@@ -55,6 +72,13 @@ the "ftpd_banner" setting is set to "bla
bd78b8
 setting and any identical setting that was in the config file.
bd78b8
 .Sh FILES
bd78b8
 .Pa /etc/vsftpd/vsftpd.conf
bd78b8
+.Pp
bd78b8
+.Pa /usr/lib/systemd/system/vsftpd.service
bd78b8
+.Pp
bd78b8
+.Pa /usr/lib/systemd/system/vsftpd@.service
bd78b8
+.Pp
bd78b8
+.Pa /usr/lib/systemd/system/vsftpd.target
bd78b8
 .Sh SEE ALSO
bd78b8
 .Xr vsftpd.conf 5
bd78b8
+.Xr systemd.unit 5
bd78b8
 .end
bd78b8
diff -up vsftpd-3.0.2/vsftpd.conf.5.sd vsftpd-3.0.2/vsftpd.conf.5
bd78b8
--- vsftpd-3.0.2/vsftpd.conf.5.sd	2013-09-04 13:04:40.391348915 +0200
bd78b8
+++ vsftpd-3.0.2/vsftpd.conf.5	2013-09-04 13:44:57.573250302 +0200
bd78b8
@@ -12,7 +12,23 @@ inetd such as
bd78b8
 .BR xinetd
bd78b8
 to launch vsftpd with different configuration files on a per virtual host
bd78b8
 basis.
bd78b8
-
bd78b8
+.P
bd78b8
+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.
bd78b8
+The vsftpd daemon(s) is/are controlled by one of following ways:
bd78b8
+.P
bd78b8
+1. Single daemon using default /etc/vsftpd/vsftpd.conf configuration file
bd78b8
+.br
bd78b8
+# systemctl {start,stop,...} vsftpd[.service]
bd78b8
+.P
bd78b8
+2. Single daemon using /etc/vsftpd/<config-filename>.conf
bd78b8
+.br
bd78b8
+# systemctl {start,stop,...} vsftpd@<config-filename-without-extension>[.service]
bd78b8
+.P
bd78b8
+3. All instances together
bd78b8
+.br
bd78b8
+# systemctl {restart,stop} vsftpd.target
bd78b8
+.P
bd78b8
+See systemd.unit(5), systemd.target(5) for further details.
bd78b8
 .SH FORMAT
bd78b8
 The format of vsftpd.conf is very simple. Each line is either a comment or
bd78b8
 a directive. Comment lines start with a # and are ignored. A directive line