fix a bunch of svn props (no functional changes):
- add svn:eol-style native where needed, seems that we forgot some files last time - nuke svn:keywords from some files where it is not used
This commit is contained in:
Robert Foerster (Dessa)
@@ -1,34 +1,34 @@
|
||||
#
|
||||
# This file is used to manage DSO modules and features.
|
||||
#
|
||||
|
||||
# This is the directory where DSO modules resides
|
||||
|
||||
ModulePath /usr/lib/proftpd
|
||||
|
||||
# Allow only user root to load and unload modules, but allow everyone
|
||||
# to see which modules have been loaded
|
||||
|
||||
ModuleControlsACLs insmod,rmmod allow user root
|
||||
ModuleControlsACLs lsmod allow user *
|
||||
|
||||
#LoadModule mod_ctrls_admin.c
|
||||
LoadModule mod_tls.c
|
||||
LoadModule mod_sql.c
|
||||
#LoadModule mod_ldap.c
|
||||
LoadModule mod_sql_mysql.c
|
||||
#LoadModule mod_sql_postgres.c
|
||||
#LoadModule mod_quotatab.c
|
||||
#LoadModule mod_quotatab_file.c
|
||||
#LoadModule mod_quotatab_ldap.c
|
||||
#LoadModule mod_quotatab_sql.c
|
||||
#LoadModule mod_radius.c
|
||||
LoadModule mod_wrap.c
|
||||
LoadModule mod_rewrite.c
|
||||
|
||||
# keep this module the last one
|
||||
LoadModule mod_ifsession.c
|
||||
|
||||
<IfModule mod_delay.c>
|
||||
DelayEngine off
|
||||
</IfModule>
|
||||
#
|
||||
# This file is used to manage DSO modules and features.
|
||||
#
|
||||
|
||||
# This is the directory where DSO modules resides
|
||||
|
||||
ModulePath /usr/lib/proftpd
|
||||
|
||||
# Allow only user root to load and unload modules, but allow everyone
|
||||
# to see which modules have been loaded
|
||||
|
||||
ModuleControlsACLs insmod,rmmod allow user root
|
||||
ModuleControlsACLs lsmod allow user *
|
||||
|
||||
#LoadModule mod_ctrls_admin.c
|
||||
LoadModule mod_tls.c
|
||||
LoadModule mod_sql.c
|
||||
#LoadModule mod_ldap.c
|
||||
LoadModule mod_sql_mysql.c
|
||||
#LoadModule mod_sql_postgres.c
|
||||
#LoadModule mod_quotatab.c
|
||||
#LoadModule mod_quotatab_file.c
|
||||
#LoadModule mod_quotatab_ldap.c
|
||||
#LoadModule mod_quotatab_sql.c
|
||||
#LoadModule mod_radius.c
|
||||
LoadModule mod_wrap.c
|
||||
LoadModule mod_rewrite.c
|
||||
|
||||
# keep this module the last one
|
||||
LoadModule mod_ifsession.c
|
||||
|
||||
<IfModule mod_delay.c>
|
||||
DelayEngine off
|
||||
</IfModule>
|
||||
|
||||
@@ -1,63 +1,63 @@
|
||||
Include /etc/proftpd/modules.conf
|
||||
|
||||
ServerName "<SERVERNAME> FTP Server"
|
||||
ServerType standalone
|
||||
DeferWelcome off
|
||||
|
||||
MultilineRFC2228 on
|
||||
DefaultServer on
|
||||
ShowSymlinks on
|
||||
AllowOverwrite on
|
||||
|
||||
TimeoutNoTransfer 600
|
||||
TimeoutStalled 600
|
||||
TimeoutIdle 1200
|
||||
|
||||
DisplayLogin welcome.msg
|
||||
DisplayFirstChdir .message
|
||||
ListOptions "-l"
|
||||
|
||||
DenyFilter \*.*/
|
||||
|
||||
Port 21
|
||||
MaxInstances 30
|
||||
UseIPv6 off
|
||||
|
||||
TransferLog /var/log/proftpd/xferlog
|
||||
SystemLog /var/log/proftpd/proftpd.log
|
||||
|
||||
# make proftpd faster / do not perform ident and reverse dns lookup
|
||||
UseReverseDNS off
|
||||
|
||||
# Set the user and group that the server normally runs at.
|
||||
User nobody
|
||||
Group nogroup
|
||||
|
||||
<Directory /*>
|
||||
# Umask 022 is a good standard umask to prevent new files and dirs
|
||||
# (second parm) from being group and world writable.
|
||||
Umask 022 022
|
||||
# Normally, we want files to be overwriteable.
|
||||
AllowOverwrite on
|
||||
</Directory>
|
||||
|
||||
DefaultRoot ~
|
||||
RequireValidShell off
|
||||
|
||||
AuthOrder mod_sql.c
|
||||
|
||||
SQLAuthTypes Crypt
|
||||
SQLAuthenticate users* groups*
|
||||
SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD>
|
||||
SQLUserInfo ftp_users username password uid gid homedir shell
|
||||
SQLGroupInfo ftp_groups groupname gid members
|
||||
SQLUserWhereClause "login_enabled = 'y'"
|
||||
|
||||
SQLLog PASS login
|
||||
SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users
|
||||
|
||||
SQLLog RETR download
|
||||
SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users
|
||||
|
||||
SQLLog STOR upload
|
||||
SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users
|
||||
Include /etc/proftpd/modules.conf
|
||||
|
||||
ServerName "<SERVERNAME> FTP Server"
|
||||
ServerType standalone
|
||||
DeferWelcome off
|
||||
|
||||
MultilineRFC2228 on
|
||||
DefaultServer on
|
||||
ShowSymlinks on
|
||||
AllowOverwrite on
|
||||
|
||||
TimeoutNoTransfer 600
|
||||
TimeoutStalled 600
|
||||
TimeoutIdle 1200
|
||||
|
||||
DisplayLogin welcome.msg
|
||||
DisplayFirstChdir .message
|
||||
ListOptions "-l"
|
||||
|
||||
DenyFilter \*.*/
|
||||
|
||||
Port 21
|
||||
MaxInstances 30
|
||||
UseIPv6 off
|
||||
|
||||
TransferLog /var/log/proftpd/xferlog
|
||||
SystemLog /var/log/proftpd/proftpd.log
|
||||
|
||||
# make proftpd faster / do not perform ident and reverse dns lookup
|
||||
UseReverseDNS off
|
||||
|
||||
# Set the user and group that the server normally runs at.
|
||||
User nobody
|
||||
Group nogroup
|
||||
|
||||
<Directory /*>
|
||||
# Umask 022 is a good standard umask to prevent new files and dirs
|
||||
# (second parm) from being group and world writable.
|
||||
Umask 022 022
|
||||
# Normally, we want files to be overwriteable.
|
||||
AllowOverwrite on
|
||||
</Directory>
|
||||
|
||||
DefaultRoot ~
|
||||
RequireValidShell off
|
||||
|
||||
AuthOrder mod_sql.c
|
||||
|
||||
SQLAuthTypes Crypt
|
||||
SQLAuthenticate users* groups*
|
||||
SQLConnectInfo <SQL_DB>@<SQL_HOST> <SQL_UNPRIVILEGED_USER> <SQL_UNPRIVILEGED_PASSWORD>
|
||||
SQLUserInfo ftp_users username password uid gid homedir shell
|
||||
SQLGroupInfo ftp_groups groupname gid members
|
||||
SQLUserWhereClause "login_enabled = 'y'"
|
||||
|
||||
SQLLog PASS login
|
||||
SQLNamedQuery login UPDATE "last_login=now(), login_count=login_count+1 WHERE username='%u'" ftp_users
|
||||
|
||||
SQLLog RETR download
|
||||
SQLNamedQuery download UPDATE "down_count=down_count+1, down_bytes=down_bytes+%b WHERE username='%u'" ftp_users
|
||||
|
||||
SQLLog STOR upload
|
||||
SQLNamedQuery upload UPDATE "up_count=up_count+1, up_bytes=up_bytes+%b WHERE username='%u'" ftp_users
|
||||
|
||||
Reference in New Issue
Block a user