[Git][debian-proftpd-team/proftpd][master] Annotated doc files and removed trailing spaces
Francesco Paolo Lovergine
frankie at debian.org
Mon Dec 21 11:26:08 GMT 2020
Francesco Paolo Lovergine pushed to branch master at Debian ProFTPD Team / proftpd
Commits:
e05206ae by Francesco Paolo Lovergine at 2020-12-21T12:25:58+01:00
Annotated doc files and removed trailing spaces
- - - - -
4 changed files:
- debian/changelog
- debian/proftpd-core.NEWS
- debian/proftpd-core.README.Debian
- debian/templates/proftpd.conf
Changes:
=====================================
debian/changelog
=====================================
@@ -1,24 +1,30 @@
-proftpd-dfsg (1.3.7a+dfsg-4) UNRELEASED; urgency=medium
+proftpd-dfsg (1.3.7a+dfsg-4) unstable; urgency=medium
- * Added a proftpd-core.docs to include a few secondary but sometimes useful
+ * Added a proftpd-core.docs to include a few secondary, but sometimes useful
contributed docs from upstream.
* Now using standard makefile for archs as provided by dpkg-dev.
* Added a sftp.conf template for optional SFTP support.
* Missing ucf management of some templates added.
* Now using debhelper-compat virtual in debian/control.
+ * Added support files for running proftpd via systemd socket. The preferred
+ way of running proftpd is the standalone mode, but now README.Debian explains
+ how inet/xinetd/socket can be used instead.
+ (closes: #740177, #657484)
+ * Removed trailing spaces at the end of lines in debian/changelog to make
+ lintian happy.
- -- Francesco Paolo Lovergine <frankie at debian.org> Tue, 15 Dec 2020 12:54:39 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 21 Dec 2020 12:15:46 +0100
proftpd-dfsg (1.3.7a+dfsg-3) unstable; urgency=medium
* Introduced a new (old) -core package and made -basic a transitional
package in order to ensure a smooth upgrade from current stable and
testing. This is due because of the new -mod-tls and mod-crypto
- packages. (closes: #977349)
+ packages. (closes: #977349)
* Added an appropriate NEWS entry.
* Changed modules.conf template to reflect changes in layouts of modules vs
packages.
- * Housekeeping proftpd-core.NEWS file and removed old global NEWS to avoid
+ * Housekeeping proftpd-core.NEWS file and removed old global NEWS to avoid
spreading the same NEWS file among multiple packages.
* Fixed short descriptions.
* Moved -mod-wrap and -mod-crypto among Suggests, thanks to changes to default
@@ -80,9 +86,9 @@ proftpd-dfsg (1.3.7a-2) unstable; urgency=medium
- E: symlink-contains-spurious-segments usr/sbin/in.proftpd ./proftpd
[ Francesco Paolo Lovergine ]
- * Now using dh methods to modernize debian/rules style.
- Cleaned up old makefile variables and now using --enable-openssl to
- enable SSL in mod_sql and mod_tls instead of using the
+ * Now using dh methods to modernize debian/rules style.
+ Cleaned up old makefile variables and now using --enable-openssl to
+ enable SSL in mod_sql and mod_tls instead of using the
HAVING_OPENSSL variable.
(closes: #842293, #848045)
* Policy bumped to 4.5.1.
=====================================
debian/proftpd-core.NEWS
=====================================
@@ -1,11 +1,20 @@
+proftpd-dfsg (1.3.7a+dfsg-4) unstable; urgency=medium
+
+ Starting from this release, while the default method of installation is
+ the traditional standalone (i.e. daemon), inet/xinetd/socket
+ configurations are supported also, at the admin's will. More information
+ are provided in README.Debian.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Mon, 21 Dec 2020 12:01:36 +0100
+
proftpd-dfsg (1.3.7a+dfsg-3) unstable; urgency=medium
-
+
Starting from this release, a few modules related to libwrap and
TLS/SSL moved to new proftpd-mod-crypto and proftpd-mod-tls, in order
to reduce the number of libraries to depend on. A transitional
package ensure to avoid breakage of existing configurations
in upgrade. New installation needs to take the new layout in
- consideration and usually install proftpd-core instead of
+ consideration and usually install proftpd-core instead of
proftpd-basic, and only strictly required add-on packages, as well.
-- Francesco Paolo Lovergine <frankie at debian.org> Mon, 14 Dec 2020 11:05:01 +0100
=====================================
debian/proftpd-core.README.Debian
=====================================
@@ -100,30 +100,40 @@ case is
It is strongly preferred using proftpd as a daemon for any serious
use. In some cases, the admin could be interested in using one of the
-superservers (inetd/xinetd) to run proftpd instances. That could be done
-by changing from 'standalone' to 'inetd' the ServerType entry in
-/etc/proftpd/proftpd.conf and enabling the service in /etc/inetd.conf
-by running
-
- update-inetd --enable proftpd
-
-or adding the proper xinetd snippet under /etc/xinet.d. For example:
-
-/etc/xinet.d/proftpd:
-
- service ftp
- {
- disable = no
- type = INTERNAL
- socket_type = stream
- protocol = tcp
- user = root
- wait = no
- server = /usr/sbin/proftpd
- }
-
-It is also possible using systemd support for socket, but this is still discouraged
-and buggy in 1.3.5 branch.
+superservers (inetd/xinetd) or systemd socket to run proftpd instances.
+
+That could be done by running
+
+ service proftpd stop
+
+then changing from 'standalone' to 'inetd' the ServerType entry in
+/etc/proftpd/proftpd.conf, and:
+
+ - enabling the service in /etc/inetd.conf by running
+
+ update-inetd --enable proftpd
+
+ - or adding the proper xinetd snippet under /etc/xinet.d. For example:
+
+ add /etc/xinet.d/proftpd:
+ service ftp
+ {
+ disable = no
+ type = INTERNAL
+ socket_type = stream
+ protocol = tcp
+ user = root
+ wait = no
+ server = /usr/sbin/proftpd
+ }
+ and restart xinetd.
+
+ - or using systemd support for socket. To do that run:
+
+ systemctl stop proftpd.service
+ systemctl disable proftpd.service
+ systemctl enable proftpd.socket
+ systemctl start proftpd.socket
** Other information
=====================================
debian/templates/proftpd.conf
=====================================
@@ -15,7 +15,7 @@ UseIPv6 on
</IfModule>
ServerName "Debian"
-# Set to inetd only if you would run proftpd by inetd/xinetd.
+# Set to inetd only if you would run proftpd by inetd/xinetd/socket.
# Read README.Debian for more information on proper configuration.
ServerType standalone
DeferWelcome off
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/e05206ae92d195c375cdd168c5214d22fb25ef5c
--
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/e05206ae92d195c375cdd168c5214d22fb25ef5c
You're receiving this email because of your account on salsa.debian.org.
More information about the Pkg-proftpd-maintainers
mailing list