diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-06-24 21:16:12 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-06-24 21:16:12 +0000 |
| commit | 7030d53190cbf3633afdde49b5e0c6174d4f3b36 (patch) | |
| tree | 66def9974078abb9306af2bd41fda579eb87ce04 /generic | |
| parent | a5f1c706cd5c9314d9747983300b05798739d109 (diff) | |
| download | ptxdist-7030d53190cbf3633afdde49b5e0c6174d4f3b36.tar.gz ptxdist-7030d53190cbf3633afdde49b5e0c6174d4f3b36.tar.xz | |
[proftpd] clean up config file
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10859 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/etc/proftpd.conf | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/generic/etc/proftpd.conf b/generic/etc/proftpd.conf index 4337a3db3..e674ecfdf 100644 --- a/generic/etc/proftpd.conf +++ b/generic/etc/proftpd.conf @@ -1,11 +1,9 @@ -# -# FTP Server for Frako # # Configuration by Robert Schwebel <r.schwebel@pengutronix.de> -# Pengutronix, 2002/10/13 +# Pengutronix, 2002/10/13 # -# ServerName "Master Webserver" +# ServerName "Master Webserver" # Spawn from inetd? #ServerType inetd @@ -28,44 +26,45 @@ User root Group root # This is a non-customer usable name, (ie they should be connecting via www.{domain}) -# not 'hostname'. Therefore let's dump them in a dummy account and wait for them to +# not 'hostname'. Therefore let's dump them in a dummy account and wait for them to # scream. DefaultRoot / # Performance, let's do DNS resolution when we process the logs... UseReverseDNS off +# Turn off Ident lookups +IdentLookups off + + # Where do we put the pid files? -ScoreboardFile /tmp/proftpd.scoreboard +ScoreboardFile /var/run/proftpd/proftpd.scoreboard # Logging options TransferLog NONE # Some logging formats -LogFormat default "%h %l %u %t \"%r\" %s %b" -LogFormat auth "%v [%P] %h %t \"%r\" %s" -LogFormat write "%h %l %u %t \"%r\" %s %b" +LogFormat default "%h %l %u %t \"%r\" %s %b" +LogFormat auth "%v [%P] %h %t \"%r\" %s" +LogFormat write "%h %l %u %t \"%r\" %s %b" # Global settings <Global> - DisplayLogin /etc/ftp-welcome.msg - DisplayFirstChdir readme - + DisplayChdir readme + # having to delete before uploading is a pain ;) AllowOverwrite yes - - # Turn off Ident lookups - + # Logging # file/dir access - #ExtendedLog /var/spool/syslog/proftpd/access.log WRITE,READ write + # ExtendedLog /var/log/proftpd/access.log WRITE,READ write # Record all logins - #ExtendedLog /var/spool/syslog/proftpd/auth.log AUTH auth - + # ExtendedLog /var/log/proftpd/auth.log AUTH auth + # Paranoia logging level.... - ##ExtendedLog /var/spool/syslog/proftpd/paranoid.log ALL default + # ExtendedLog /var/log/proftpd/paranoid.log ALL default </Global> @@ -74,5 +73,6 @@ LogFormat write "%h %l %u %t \"%r\" %s %b" </Directory> # Where to store the PID of the proftpd process in standalone mode -PidFile /tmp/proftpd.pid +PidFile /var/run/proftpd.pid +DelayTable /var/run/proftpd/proftpd.delay |