[Git][debian-proftpd-team/proftpd][master] Revised templates and removed trailed spaces and TABs.
Francesco Paolo Lovergine
frankie at debian.org
Sat Jan 2 09:37:49 GMT 2021
Francesco Paolo Lovergine pushed to branch master at Debian ProFTPD Team / proftpd
Commits:
ae08a8a9 by Francesco Paolo Lovergine at 2021-01-02T10:37:23+01:00
Revised templates and removed trailed spaces and TABs.
- - - - -
3 changed files:
- debian/proftpd-core.NEWS
- debian/templates/proftpd.conf
- debian/templates/mod_snmp.conf → debian/templates/snmp.conf
Changes:
=====================================
debian/proftpd-core.NEWS
=====================================
@@ -4,9 +4,9 @@ proftpd-dfsg (1.3.7a+dfsg-6) unstable; urgency=medium
(i.e. daemon) mode, but inet/xinetd/socket configurations are now
supported again, at the admin's will. More information about that are
provided in README.Debian. Note that the standalone installation
- is now via systemd, even if the traditional sysv init script
- is still provided (but not used), for people that eventually would
- prefer to use it.
+ is now via systemd, even if the traditional sysv init script
+ is still provided (but not used), for people that eventually would
+ prefer to use it.
Starting from this release, a few modules related to libwrap and
TLS/SSL moved to new proftpd-mod-crypto and proftpd-mod-wrap,
=====================================
debian/templates/proftpd.conf
=====================================
@@ -2,48 +2,48 @@
# /etc/proftpd/proftpd.conf -- This is a basic ProFTPD configuration file.
# To really apply changes, reload proftpd after modifications, if
# it runs in daemon mode. It is not required in inetd/xinetd mode.
-#
+#
# Includes DSO modules
Include /etc/proftpd/modules.conf
# Set off to disable IPv6 support which is annoying on IPv4 only boxes.
-UseIPv6 on
+UseIPv6on
# If set on you can experience a longer connection delay in many cases.
<IfModule mod_ident.c>
- IdentLookups off
+ IdentLookups off
</IfModule>
-ServerName "Debian"
+ServerName"Debian"
# 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
+ServerType standalone
+DeferWelcome off
# Disable MultilineRFC2228 per https://github.com/proftpd/proftpd/issues/1085
-# MultilineRFC2228 on
-DefaultServer on
-ShowSymlinks on
+# MultilineRFC2228on
+DefaultServer on
+ShowSymlinks on
-TimeoutNoTransfer 600
-TimeoutStalled 600
-TimeoutIdle 1200
+TimeoutNoTransfer 600
+TimeoutStalled 600
+TimeoutIdle 1200
-DisplayLogin welcome.msg
-DisplayChdir .message true
-ListOptions "-l"
+DisplayLogin welcome.msg
+DisplayChdir .message true
+ListOptions "-l"
-DenyFilter \*.*/
+DenyFilter \*.*/
# Use this to jail all users in their homes
-# DefaultRoot ~
+# DefaultRoot~
# Users require a valid shell listed in /etc/shells to login.
# Use this directive to release that constrain.
-# RequireValidShell off
+# RequireValidShelloff
# Port 21 is the standard FTP port.
-Port 21
+Port21
# In some cases you have to specify passive ports range to by-pass
# firewall limitations. Ephemeral ports can be used for that, but
@@ -53,7 +53,7 @@ Port 21
# If your host was NATted, this option is useful in order to
# allow passive tranfers to work. You have to use your public
# address and opening the passive ports used on your firewall as well.
-# MasqueradeAddress 1.2.3.4
+# MasqueradeAddress1.2.3.4
# This is useful for masquerading address with dynamic IPs:
# refresh any configured MasqueradeAddress directives every 8 hours
@@ -67,32 +67,32 @@ Port 21
# in standalone mode, in inetd mode you should use an inetd server
# that allows you to limit maximum number of processes per service
# (such as xinetd)
-MaxInstances 30
+MaxInstances30
# Set the user and group that the server normally runs at.
-User proftpd
-Group nogroup
+Userproftpd
+Groupnogroup
# Umask 022 is a good standard umask to prevent new files and dirs
# (second parm) from being group and world writable.
-Umask 022 022
+Umask022 022
# Normally, we want files to be overwriteable.
-AllowOverwrite on
+AllowOverwriteon
# Uncomment this if you are using NIS or LDAP via NSS to retrieve passwords:
-# PersistentPasswd off
+# PersistentPasswdoff
# This is required to use both PAM-based authentication and local passwords
-# AuthOrder mod_auth_pam.c* mod_auth_unix.c
+# AuthOrdermod_auth_pam.c* mod_auth_unix.c
# Be warned: use of this directive impacts CPU average load!
# Uncomment this if you like to see progress and transfer rate with ftpwho
# in downloads. That is not needed for uploads rates.
#
-# UseSendFile off
+# UseSendFileoff
TransferLog /var/log/proftpd/xferlog
-SystemLog /var/log/proftpd/proftpd.log
+SystemLog /var/log/proftpd/proftpd.log
# Logging onto /var/log/lastlog is enabled but set to off by default
#UseLastlog on
@@ -120,11 +120,11 @@ DelayEngine on
</IfModule>
<IfModule mod_ctrls.c>
-ControlsEngine off
-ControlsMaxClients 2
-ControlsLog /var/log/proftpd/controls.log
-ControlsInterval 5
-ControlsSocket /var/run/proftpd/proftpd.sock
+ControlsEngine off
+ControlsMaxClients 2
+ControlsLog /var/log/proftpd/controls.log
+ControlsInterval 5
+ControlsSocket /var/run/proftpd/proftpd.sock
</IfModule>
<IfModule mod_ctrls_admin.c>
@@ -142,6 +142,18 @@ AdminControlsEngine off
#
#Include /etc/proftpd/tls.conf
+#
+# This is used for SFTP connections
+#
+#Include /etc/proftpd/sftp.conf
+
+#
+# This is used for other add-on modules
+#
+#Include /etc/proftpd/dnsbl.conf
+#Include /etc/proftpd/geoip.conf
+#Include /etc/proftpd/snmp.conf
+
#
# Useful to keep VirtualHost/VirtualRoot directives separated
#
@@ -150,23 +162,23 @@ AdminControlsEngine off
# A basic anonymous configuration, no upload directories.
# <Anonymous ~ftp>
-# User ftp
-# Group nogroup
+# Userftp
+# Groupnogroup
# # We want clients to be able to login with "anonymous" as well as "ftp"
-# UserAlias anonymous ftp
+# UserAliasanonymous ftp
# # Cosmetic changes, all files belongs to ftp user
-# DirFakeUser on ftp
+# DirFakeUseron ftp
# DirFakeGroup on ftp
#
-# RequireValidShell off
+# RequireValidShelloff
#
# # Limit the maximum number of anonymous logins
-# MaxClients 10
+# MaxClients10
#
# # We want 'welcome.msg' displayed at login, and '.message' displayed
# # in each newly chdired directory.
-# DisplayLogin welcome.msg
-# DisplayChdir .message
+# DisplayLoginwelcome.msg
+# DisplayChdir.message
#
# # Limit WRITE everywhere in the anonymous chroot
# <Directory *>
@@ -179,13 +191,13 @@ AdminControlsEngine off
# # <Directory incoming>
# # # Umask 022 is a good standard umask to prevent new files and dirs
# # # (second parm) from being group and world writable.
-# # Umask 022 022
-# # <Limit READ WRITE>
-# # DenyAll
-# # </Limit>
-# # <Limit STOR>
-# # AllowAll
-# # </Limit>
+# # Umask022 022
+# # <Limit READ WRITE>
+# # DenyAll
+# # </Limit>
+# # <Limit STOR>
+# # AllowAll
+# # </Limit>
# # </Directory>
#
# </Anonymous>
=====================================
debian/templates/mod_snmp.conf → debian/templates/snmp.conf
=====================================
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/ae08a8a9fc50735494e2d1eedb0c98b91f87e012
--
View it on GitLab: https://salsa.debian.org/debian-proftpd-team/proftpd/-/commit/ae08a8a9fc50735494e2d1eedb0c98b91f87e012
You're receiving this email because of your account on salsa.debian.org.
More information about the Pkg-proftpd-maintainers
mailing list