Contents of /trunk/proftpd/patches/proftpd-1.3.1-config.patch
Parent Directory | Revision Log
Revision 368 -
(show annotations)
(download)
Sat Oct 6 15:05:16 2007 UTC (16 years, 11 months ago) by niro
File size: 7586 byte(s)
Sat Oct 6 15:05:16 2007 UTC (16 years, 11 months ago) by niro
File size: 7586 byte(s)
-ver bump to 1.3.1
1 | diff -Naur proftpd-1.3.1/sample-configurations/anonymous.conf proftpd-1.3.1-magellan/sample-configurations/anonymous.conf |
2 | --- proftpd-1.3.1/sample-configurations/anonymous.conf 2007-03-09 20:01:29.000000000 +0100 |
3 | +++ proftpd-1.3.1-magellan/sample-configurations/anonymous.conf 2007-10-06 16:59:08.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 | DisplayChdir .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.1/sample-configurations/basic.conf proftpd-1.3.1-magellan/sample-configurations/basic.conf |
47 | --- proftpd-1.3.1/sample-configurations/basic.conf 2007-03-09 20:01:30.000000000 +0100 |
48 | +++ proftpd-1.3.1-magellan/sample-configurations/basic.conf 2007-10-06 17:02:39.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 | - DisplayChdir .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.1/sample-configurations/mod_sql.conf proftpd-1.3.1-magellan/sample-configurations/mod_sql.conf |
147 | --- proftpd-1.3.1/sample-configurations/mod_sql.conf 2007-04-16 05:07:43.000000000 +0200 |
148 | +++ proftpd-1.3.1-magellan/sample-configurations/mod_sql.conf 2007-10-06 17:03:58.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 | @@ -159,6 +168,9 @@ |
180 | AllowOverwrite on |
181 | </Directory> |
182 | |
183 | +TransferLog /var/log/proftpd/xferlog |
184 | +SystemLog /var/log/proftpd/proftpd.log |
185 | + |
186 | # A basic anonymous configuration, no upload directories. If you |
187 | # don't want to support anonymous access, simply remove this |
188 | # <Anonymous ..> ... </Anonymous> block. |
189 | diff -Naur proftpd-1.3.1/sample-configurations/virtual.conf proftpd-1.3.1-magellan/sample-configurations/virtual.conf |
190 | --- proftpd-1.3.1/sample-configurations/virtual.conf 2003-07-25 07:36:24.000000000 +0200 |
191 | +++ proftpd-1.3.1-magellan/sample-configurations/virtual.conf 2007-10-06 17:05:29.000000000 +0200 |
192 | @@ -1,8 +1,18 @@ |
193 | # This sample configuration file illustrates creating two |
194 | # virtual servers, and associated anonymous logins. |
195 | |
196 | -ServerName "ProFTPD" |
197 | -ServerType inetd |
198 | +# Includes DSO modules |
199 | +Include /etc/proftpd/modules.conf |
200 | + |
201 | +ServerName "Magellan Virtual Server Installation" |
202 | +ServerType standalone |
203 | + |
204 | +DefaultServer on |
205 | +MultilineRFC2228 on |
206 | +ShowSymlinks on |
207 | + |
208 | +# Set off to disable IPv6 support which is annoying on IPv4 only boxes. |
209 | +UseIPv6 on |
210 | |
211 | # Port 21 is the standard FTP port. |
212 | Port 21 |
213 | @@ -11,14 +21,14 @@ |
214 | # main server and all virtualhosts. |
215 | |
216 | <Global> |
217 | - # Umask 022 is a good standard umask to prevent new dirs and files |
218 | - # from being group and world writable. |
219 | - Umask 022 |
220 | + # Umask 022 is a good standard umask to prevent new files and dirs |
221 | + # (second param) from being group and world writable. |
222 | + Umask 022 022 |
223 | </Global> |
224 | |
225 | # Set the user and group that the server normally runs at. |
226 | -User nobody |
227 | -Group nogroup |
228 | +User proftpd |
229 | +Group proftpd |
230 | |
231 | # To prevent DoS attacks, set the maximum number of child processes |
232 | # to 30. If you need to allow more than 30 concurrent connections |
233 | @@ -31,6 +41,9 @@ |
234 | # Maximum seconds a data connection may "stall" |
235 | TimeoutStalled 300 |
236 | |
237 | +TransferLog /var/log/proftpd/xferlog |
238 | +SystemLog /var/log/proftpd/proftpd.log |
239 | + |
240 | # First virtual server |
241 | <VirtualHost ftp.virtual.com> |
242 | ServerName "Virtual.com's FTP Server" |