Changeset 2437
- Timestamp:
- 11/20/08 15:19:14 (2 months ago)
- Files:
-
- cherokee/trunk/ChangeLog (modified) (1 diff)
- cherokee/trunk/admin/PageEntry.py (modified) (1 diff)
- cherokee/trunk/admin/PageVServer.py (modified) (1 diff)
- cherokee/trunk/admin/PageVServers.py (modified) (1 diff)
- cherokee/trunk/admin/validations.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
cherokee/trunk/ChangeLog
r2436 r2437 3 3 * cherokee/handler_dbslayer.c (dbslayer_step): Spurious warning 4 4 removed from proccessing of Multi-Statement queries. 5 6 * admin/PageEntry.py, admin/PageVServers.py, admin/PageVServer.py, 7 admin/validations.py: allows /dev/null as path. No need for 8 /var/www/fake from now on. 5 9 6 10 2008-11-20 Alvaro Lopez Ortega <alvaro@octality.com> cherokee/trunk/admin/PageEntry.py
r2267 r2437 21 21 22 22 DATA_VALIDATION = [ 23 ("vserver!.*?!rule!(\d+)!document_root", (validations.is_ local_dir_exists, 'cfg')),23 ("vserver!.*?!rule!(\d+)!document_root", (validations.is_dev_null_or_local_dir_exists, 'cfg')), 24 24 ("vserver!.*?!rule!(\d+)!allow_from", validations.is_ip_or_netmask_list) 25 25 ] cherokee/trunk/admin/PageVServer.py
r2347 r2437 10 10 11 11 DATA_VALIDATION = [ 12 ("vserver!.*?!document_root", (validations.is_ local_dir_exists, 'cfg')),12 ("vserver!.*?!document_root", (validations.is_dev_null_or_local_dir_exists, 'cfg')), 13 13 ("vserver!.*?!ssl_certificate_file", (validations.is_local_file_exists, 'cfg')), 14 14 ("vserver!.*?!ssl_certificate_key_file", (validations.is_local_file_exists, 'cfg')), cherokee/trunk/admin/PageVServers.py
r2210 r2437 8 8 DATA_VALIDATION = [ 9 9 ("new_vserver_name", validations.is_safe_id), 10 ("new_vserver_droot", (validations.is_ local_dir_exists, 'cfg')),10 ("new_vserver_droot", (validations.is_dev_null_or_local_dir_exists, 'cfg')), 11 11 ] 12 12 cherokee/trunk/admin/validations.py
r2316 r2437 231 231 raise ValueError, 'Not a URL, nor a path' 232 232 233 233 def is_dev_null_or_local_dir_exists (value, cfg): 234 if value == '/dev/null': 235 return value 236 return is_local_dir_exists (value, cfg)