09c09a59c9
removes exclusivity between listen and listen_ipv6 BZ#450853 ls wildchars supports square brackets
36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
diff -up vsftpd-2.3.4/vsftpd.8.sd vsftpd-2.3.4/vsftpd.8
|
|
--- vsftpd-2.3.4/vsftpd.8.sd 2011-11-14 15:22:50.363265369 +0100
|
|
+++ vsftpd-2.3.4/vsftpd.8 2011-11-15 08:32:55.270895429 +0100
|
|
@@ -25,6 +25,8 @@ in
|
|
Direct execution of the
|
|
.Nm vsftpd
|
|
binary will then launch the FTP service ready for immediate client connections.
|
|
+.Pp
|
|
+Systemd changes the vsftpd start-up. When the SysV initscript attempts to start one instance of the vsftpd daemon for each of /etc/vsftpd/*.conf file, each configuration file requires a proper unit file. Each instance of the vsftpd daemon is started separately. See systemd.unit(5).
|
|
.Sh OPTIONS
|
|
An optional
|
|
configuration file or files
|
|
@@ -55,6 +57,9 @@ the "ftpd_banner" setting is set to "bla
|
|
setting and any identical setting that was in the config file.
|
|
.Sh FILES
|
|
.Pa /etc/vsftpd/vsftpd.conf
|
|
+.Pp
|
|
+.Pa /lib/systemd/system/vsftpd.service
|
|
.Sh SEE ALSO
|
|
.Xr vsftpd.conf 5
|
|
+.Xr systemd.unit 5
|
|
.end
|
|
diff -up vsftpd-2.3.4/vsftpd.conf.5.sd vsftpd-2.3.4/vsftpd.conf.5
|
|
--- vsftpd-2.3.4/vsftpd.conf.5.sd 2011-11-14 15:22:50.546267713 +0100
|
|
+++ vsftpd-2.3.4/vsftpd.conf.5 2011-11-15 08:48:42.872580090 +0100
|
|
@@ -13,6 +13,9 @@ inetd such as
|
|
to launch vsftpd with different configuration files on a per virtual host
|
|
basis.
|
|
|
|
+Systemd changes the vsftpd daemon start-up. Each configuration file
|
|
+requires a proper unit file that can be obtained by cloning and modifying default vsftpd.service. This additional unit file should be placed to /etc/systemd/system. See systemd.unit(5) for details.
|
|
+
|
|
.SH FORMAT
|
|
The format of vsftpd.conf is very simple. Each line is either a comment or
|
|
a directive. Comment lines start with a # and are ignored. A directive line
|