diff -Naur proftpd-1.3.1/sample-configurations/anonymous.conf proftpd-1.3.1-magellan/sample-configurations/anonymous.conf --- proftpd-1.3.1/sample-configurations/anonymous.conf 2007-03-09 20:01:29.000000000 +0100 +++ proftpd-1.3.1-magellan/sample-configurations/anonymous.conf 2007-10-06 16:59:08.000000000 +0200 @@ -2,9 +2,19 @@ # anonymous directories, and a guest (same thing as anonymous but # requires a valid password to login) -ServerName "ProFTPD Anonymous Server" +# Includes DSO modules +Include /etc/proftpd/modules.conf + +ServerName "Magellan Anonymous Server" ServerType standalone +DefaultServer on +MultilineRFC2228 on +ShowSymlinks on + +# Set off to disable IPv6 support which is annoying on IPv4 only boxes. +UseIPv6 off + # Port 21 is the standard FTP port. Port 21 @@ -15,8 +25,8 @@ # # Set the user and group that the server normally runs at. -User nobody -Group nogroup +User proftpd +Group proftpd # To prevent DoS attacks, set the maximum number of child processes # to 30. If you need to allow more than 30 concurrent connections @@ -35,6 +45,9 @@ DisplayLogin welcome.msg DisplayChdir .message +TransferLog /var/log/proftpd/xferlog +SystemLog /var/log/proftpd/proftpd.log + # Our "basic" anonymous configuration, including a single # upload directory ("uploads") diff -Naur proftpd-1.3.1/sample-configurations/basic.conf proftpd-1.3.1-magellan/sample-configurations/basic.conf --- proftpd-1.3.1/sample-configurations/basic.conf 2007-03-09 20:01:30.000000000 +0100 +++ proftpd-1.3.1-magellan/sample-configurations/basic.conf 2007-10-06 17:02:39.000000000 +0200 @@ -1,18 +1,26 @@ -# This is a basic ProFTPD configuration file (rename it to -# 'proftpd.conf' for actual use. It establishes a single server -# and a single anonymous login. It assumes that you have a user/group -# "nobody" and "ftp" for normal operation and anon. +# +# /etc/proftpd/proftpd.conf - basic ProFTPD configuration file. +# -ServerName "ProFTPD Default Installation" +# Includes DSO modules +Include /etc/proftpd/modules.conf + +ServerName "Magellan" ServerType standalone + DefaultServer on +MultilineRFC2228 on +ShowSymlinks on + +# Set off to disable IPv6 support which is annoying on IPv4 only boxes. +UseIPv6 off # Port 21 is the standard FTP port. Port 21 -# Umask 022 is a good standard umask to prevent new dirs and files -# from being group and world writable. -Umask 022 +# Umask 022 is a good standard umask to prevent new files and dirs +# (seconf parm) from being group and world writable. +Umask 022 022 # To prevent DoS attacks, set the maximum number of child processes # to 30. If you need to allow more than 30 concurrent connections @@ -23,8 +31,8 @@ MaxInstances 30 # Set the user and group under which the server will run. -User nobody -Group nogroup +User proftpd +Group proftpd # To cause every FTP user to be "jailed" (chrooted) into their home # directory, uncomment this line. @@ -38,25 +46,28 @@ DenyAll -# A basic anonymous configuration, no upload directories. If you do not -# want anonymous users, simply delete this entire section. - - User ftp - Group ftp - - # We want clients to be able to login with "anonymous" as well as "ftp" - UserAlias anonymous ftp - - # Limit the maximum number of anonymous logins - MaxClients 10 - - # We want 'welcome.msg' displayed at login, and '.message' displayed - # in each newly chdired directory. - DisplayLogin welcome.msg - DisplayChdir .message - - # Limit WRITE everywhere in the anonymous chroot - - DenyAll - - +TransferLog /var/log/proftpd/xferlog +SystemLog /var/log/proftpd/proftpd.log + +# A basic anonymous configuration, no upload directories. + +# +# User ftp +# Group ftp +# +# # We want clients to be able to login with "anonymous" as well as "ftp" +# UserAlias anonymous ftp +# +# # Limit the maximum number of anonymous logins +# MaxClients 10 +# +# # We want 'welcome.msg' displayed at login, and '.message' displayed +# # in each newly chdired directory. +# DisplayLogin welcome.msg +# DisplayFirstChdir .message +# +# # Limit WRITE everywhere in the anonymous chroot +# +# DenyAll +# +# diff -Naur proftpd-1.3.1/sample-configurations/mod_sql.conf proftpd-1.3.1-magellan/sample-configurations/mod_sql.conf --- proftpd-1.3.1/sample-configurations/mod_sql.conf 2007-04-16 05:07:43.000000000 +0200 +++ proftpd-1.3.1-magellan/sample-configurations/mod_sql.conf 2007-10-06 17:03:58.000000000 +0200 @@ -59,16 +59,25 @@ # block. -ServerName "ProFTPD Default Installation" +# Includes DSO modules +Include /etc/proftpd/modules.conf + +ServerName "Magellan SQL Installation" ServerType standalone + DefaultServer on +MultilineRFC2228 on +ShowSymlinks on + +# Set off to disable IPv6 support which is annoying on IPv4 only boxes. +UseIPv6 off # Port 21 is the standard FTP port. Port 21 -# Umask 022 is a good standard umask to prevent new dirs and files -# from being group and world writable. -Umask 022 +# Umask 022 is a good standard umask to prevent new files and dirs +# (second param) from being group and world writable. +Umask 022 022 # We put our mod_sql directives in a block so they'll be # inherited by the block below, and any other @@ -159,6 +168,9 @@ AllowOverwrite on +TransferLog /var/log/proftpd/xferlog +SystemLog /var/log/proftpd/proftpd.log + # A basic anonymous configuration, no upload directories. If you # don't want to support anonymous access, simply remove this # ... block. diff -Naur proftpd-1.3.1/sample-configurations/virtual.conf proftpd-1.3.1-magellan/sample-configurations/virtual.conf --- proftpd-1.3.1/sample-configurations/virtual.conf 2003-07-25 07:36:24.000000000 +0200 +++ proftpd-1.3.1-magellan/sample-configurations/virtual.conf 2007-10-06 17:05:29.000000000 +0200 @@ -1,8 +1,18 @@ # This sample configuration file illustrates creating two # virtual servers, and associated anonymous logins. -ServerName "ProFTPD" -ServerType inetd +# Includes DSO modules +Include /etc/proftpd/modules.conf + +ServerName "Magellan Virtual Server Installation" +ServerType standalone + +DefaultServer on +MultilineRFC2228 on +ShowSymlinks on + +# Set off to disable IPv6 support which is annoying on IPv4 only boxes. +UseIPv6 on # Port 21 is the standard FTP port. Port 21 @@ -11,14 +21,14 @@ # main server and all virtualhosts. - # Umask 022 is a good standard umask to prevent new dirs and files - # from being group and world writable. - Umask 022 + # Umask 022 is a good standard umask to prevent new files and dirs + # (second param) from being group and world writable. + Umask 022 022 # Set the user and group that the server normally runs at. -User nobody -Group nogroup +User proftpd +Group proftpd # To prevent DoS attacks, set the maximum number of child processes # to 30. If you need to allow more than 30 concurrent connections @@ -31,6 +41,9 @@ # Maximum seconds a data connection may "stall" TimeoutStalled 300 +TransferLog /var/log/proftpd/xferlog +SystemLog /var/log/proftpd/proftpd.log + # First virtual server ServerName "Virtual.com's FTP Server"