Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/proftpd/patches/proftpd-1.3.0a-config.patch

    Annotation of /trunk/proftpd/patches/proftpd-1.3.0a-config.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 265 - (hide annotations) (download)
    Wed Jul 11 23:16:10 2007 UTC (16 years, 11 months ago) by niro
    File size: 7829 byte(s) 
    - proftpd-1.3.0a-r1
    1 niro 265 diff -Naur proftpd-1.3.0a/sample-configurations/anonymous.conf proftpd-1.3.0a-magellan/sample-configurations/anonymous.conf
    2     --- proftpd-1.3.0a/sample-configurations/anonymous.conf 2003-07-25 07:36:24.000000000 +0200
    3     +++ proftpd-1.3.0a-magellan/sample-configurations/anonymous.conf 2007-07-12 00:04:00.000000000 +0200
    4     @@ -2,9 +2,19 @@
    5     # anonymous directories, and a guest (same thing as anonymous but
    6     # requires a valid password to login)
    7    
    8     -ServerName "ProFTPD Anonymous Server"
    9     +# Includes DSO modules
    10     +Include /etc/proftpd/modules.conf
    11     +
    12     +ServerName "Magellan Anonymous Server"
    13     ServerType standalone
    14    
    15     +DefaultServer on
    16     +MultilineRFC2228 on
    17     +ShowSymlinks on
    18     +
    19     +# Set off to disable IPv6 support which is annoying on IPv4 only boxes.
    20     +UseIPv6 off
    21     +
    22     # Port 21 is the standard FTP port.
    23     Port 21
    24    
    25     @@ -15,8 +25,8 @@
    26     #</Limit>
    27    
    28     # Set the user and group that the server normally runs at.
    29     -User nobody
    30     -Group nogroup
    31     +User proftpd
    32     +Group proftpd
    33    
    34     # To prevent DoS attacks, set the maximum number of child processes
    35     # to 30. If you need to allow more than 30 concurrent connections
    36     @@ -35,6 +45,9 @@
    37     DisplayLogin welcome.msg
    38     DisplayFirstChdir .message
    39    
    40     +TransferLog /var/log/proftpd/xferlog
    41     +SystemLog /var/log/proftpd/proftpd.log
    42     +
    43     # Our "basic" anonymous configuration, including a single
    44     # upload directory ("uploads")
    45     <Anonymous ~ftp>
    46     diff -Naur proftpd-1.3.0a/sample-configurations/basic.conf proftpd-1.3.0a-magellan/sample-configurations/basic.conf
    47     --- proftpd-1.3.0a/sample-configurations/basic.conf 2004-04-15 20:46:38.000000000 +0200
    48     +++ proftpd-1.3.0a-magellan/sample-configurations/basic.conf 2007-07-12 00:04:12.000000000 +0200
    49     @@ -1,18 +1,26 @@
    50     -# This is a basic ProFTPD configuration file (rename it to
    51     -# 'proftpd.conf' for actual use. It establishes a single server
    52     -# and a single anonymous login. It assumes that you have a user/group
    53     -# "nobody" and "ftp" for normal operation and anon.
    54     +#
    55     +# /etc/proftpd/proftpd.conf - basic ProFTPD configuration file.
    56     +#
    57    
    58     -ServerName "ProFTPD Default Installation"
    59     +# Includes DSO modules
    60     +Include /etc/proftpd/modules.conf
    61     +
    62     +ServerName "Magellan"
    63     ServerType standalone
    64     +
    65     DefaultServer on
    66     +MultilineRFC2228 on
    67     +ShowSymlinks on
    68     +
    69     +# Set off to disable IPv6 support which is annoying on IPv4 only boxes.
    70     +UseIPv6 off
    71    
    72     # Port 21 is the standard FTP port.
    73     Port 21
    74    
    75     -# Umask 022 is a good standard umask to prevent new dirs and files
    76     -# from being group and world writable.
    77     -Umask 022
    78     +# Umask 022 is a good standard umask to prevent new files and dirs
    79     +# (seconf parm) from being group and world writable.
    80     +Umask 022 022
    81    
    82     # To prevent DoS attacks, set the maximum number of child processes
    83     # to 30. If you need to allow more than 30 concurrent connections
    84     @@ -23,8 +31,8 @@
    85     MaxInstances 30
    86    
    87     # Set the user and group under which the server will run.
    88     -User nobody
    89     -Group nogroup
    90     +User proftpd
    91     +Group proftpd
    92    
    93     # To cause every FTP user to be "jailed" (chrooted) into their home
    94     # directory, uncomment this line.
    95     @@ -38,25 +46,28 @@
    96     DenyAll
    97     </Limit>
    98    
    99     -# A basic anonymous configuration, no upload directories. If you do not
    100     -# want anonymous users, simply delete this entire <Anonymous> section.
    101     -<Anonymous ~ftp>
    102     - User ftp
    103     - Group ftp
    104     -
    105     - # We want clients to be able to login with "anonymous" as well as "ftp"
    106     - UserAlias anonymous ftp
    107     -
    108     - # Limit the maximum number of anonymous logins
    109     - MaxClients 10
    110     -
    111     - # We want 'welcome.msg' displayed at login, and '.message' displayed
    112     - # in each newly chdired directory.
    113     - DisplayLogin welcome.msg
    114     - DisplayFirstChdir .message
    115     -
    116     - # Limit WRITE everywhere in the anonymous chroot
    117     - <Limit WRITE>
    118     - DenyAll
    119     - </Limit>
    120     -</Anonymous>
    121     +TransferLog /var/log/proftpd/xferlog
    122     +SystemLog /var/log/proftpd/proftpd.log
    123     +
    124     +# A basic anonymous configuration, no upload directories.
    125     +
    126     +# <Anonymous ~ftp>
    127     +# User ftp
    128     +# Group ftp
    129     +#
    130     +# # We want clients to be able to login with "anonymous" as well as "ftp"
    131     +# UserAlias anonymous ftp
    132     +#
    133     +# # Limit the maximum number of anonymous logins
    134     +# MaxClients 10
    135     +#
    136     +# # We want 'welcome.msg' displayed at login, and '.message' displayed
    137     +# # in each newly chdired directory.
    138     +# DisplayLogin welcome.msg
    139     +# DisplayFirstChdir .message
    140     +#
    141     +# # Limit WRITE everywhere in the anonymous chroot
    142     +# <Limit WRITE>
    143     +# DenyAll
    144     +# </Limit>
    145     +# </Anonymous>
    146     diff -Naur proftpd-1.3.0a/sample-configurations/mod_sql.conf proftpd-1.3.0a-magellan/sample-configurations/mod_sql.conf
    147     --- proftpd-1.3.0a/sample-configurations/mod_sql.conf 2003-08-16 17:47:01.000000000 +0200
    148     +++ proftpd-1.3.0a-magellan/sample-configurations/mod_sql.conf 2007-07-12 00:04:39.000000000 +0200
    149     @@ -59,16 +59,25 @@
    150     # block.
    151    
    152    
    153     -ServerName "ProFTPD Default Installation"
    154     +# Includes DSO modules
    155     +Include /etc/proftpd/modules.conf
    156     +
    157     +ServerName "Magellan SQL Installation"
    158     ServerType standalone
    159     +
    160     DefaultServer on
    161     +MultilineRFC2228 on
    162     +ShowSymlinks on
    163     +
    164     +# Set off to disable IPv6 support which is annoying on IPv4 only boxes.
    165     +UseIPv6 off
    166    
    167     # Port 21 is the standard FTP port.
    168     Port 21
    169    
    170     -# Umask 022 is a good standard umask to prevent new dirs and files
    171     -# from being group and world writable.
    172     -Umask 022
    173     +# Umask 022 is a good standard umask to prevent new files and dirs
    174     +# (second param) from being group and world writable.
    175     +Umask 022 022
    176    
    177     # We put our mod_sql directives in a <Global> block so they'll be
    178     # inherited by the <Anonymous> block below, and any other <VirtualHost>
    179     @@ -153,14 +162,17 @@
    180     MaxInstances 30
    181    
    182     # Set the normal user and group permissions for the server.
    183     -User nobody
    184     -Group nogroup
    185     +User proftpd
    186     +Group proftpd
    187    
    188     # Normally, we want files to be overwriteable.
    189     <Directory />
    190     AllowOverwrite on
    191     </Directory>
    192    
    193     +TransferLog /var/log/proftpd/xferlog
    194     +SystemLog /var/log/proftpd/proftpd.log
    195     +
    196     # A basic anonymous configuration, no upload directories. If you
    197     # don't want to support anonymous access, simply remove this
    198     # <Anonymous ..> ... </Anonymous> block.
    199     diff -Naur proftpd-1.3.0a/sample-configurations/virtual.conf proftpd-1.3.0a-magellan/sample-configurations/virtual.conf
    200     --- proftpd-1.3.0a/sample-configurations/virtual.conf 2003-07-25 07:36:24.000000000 +0200
    201     +++ proftpd-1.3.0a-magellan/sample-configurations/virtual.conf 2007-07-12 00:04:52.000000000 +0200
    202     @@ -1,8 +1,18 @@
    203     # This sample configuration file illustrates creating two
    204     # virtual servers, and associated anonymous logins.
    205    
    206     -ServerName "ProFTPD"
    207     -ServerType inetd
    208     +# Includes DSO modules
    209     +Include /etc/proftpd/modules.conf
    210     +
    211     +ServerName "Magellan Virtual Server Installation"
    212     +ServerType standalone
    213     +
    214     +DefaultServer on
    215     +MultilineRFC2228 on
    216     +ShowSymlinks on
    217     +
    218     +# Set off to disable IPv6 support which is annoying on IPv4 only boxes.
    219     +UseIPv6 on
    220    
    221     # Port 21 is the standard FTP port.
    222     Port 21
    223     @@ -11,14 +21,14 @@
    224     # main server and all virtualhosts.
    225    
    226     <Global>
    227     - # Umask 022 is a good standard umask to prevent new dirs and files
    228     - # from being group and world writable.
    229     - Umask 022
    230     + # Umask 022 is a good standard umask to prevent new files and dirs
    231     + # (second param) from being group and world writable.
    232     + Umask 022 022
    233     </Global>
    234    
    235     # Set the user and group that the server normally runs at.
    236     -User nobody
    237     -Group nogroup
    238     +User proftpd
    239     +Group proftpd
    240    
    241     # To prevent DoS attacks, set the maximum number of child processes
    242     # to 30. If you need to allow more than 30 concurrent connections
    243     @@ -31,6 +41,9 @@
    244     # Maximum seconds a data connection may "stall"
    245     TimeoutStalled 300
    246    
    247     +TransferLog /var/log/proftpd/xferlog
    248     +SystemLog /var/log/proftpd/proftpd.log
    249     +
    250     # First virtual server
    251     <VirtualHost ftp.virtual.com>
    252     ServerName "Virtual.com's FTP Server"