Rev 29: Cleanup configuration files. in http://bazaar.launchpad.net/%7Evila/bzr/local-test-server

[Vincent Ladeuil]

At http://bazaar.launchpad.net/%7Evila/bzr/local-test-server

------------------------------------------------------------
revno: 29
revision-id: v.ladeuil+lp at free.fr-20080604192336-idor6euv9esfpcn3
parent: v.ladeuil+lp at free.fr-20080604141844-8h0blwpqyvec5okb
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: local_test_server
timestamp: Wed 2008-06-04 21:23:36 +0200
message:
  Cleanup configuration files.
  
  * configs/lighttpd.conf: 
  Cleanup.
  
  * configs/cherokee.conf: 
  Cleanup.
  
  * configs/apache2.conf: 
  Cleanup.
modified:
  TODO                           todo-20080526134120-eibvvebw74t8j2xh-1
  configs/apache2.conf           apache2.conf-20080522095851-6eixwo2qv9brec67-1
  configs/cherokee.conf          cherokee.conf-20080602161043-hiehb0n7zkbabaec-1
  configs/lighttpd.conf          lighttpd.conf-20080604073047-7ngngi8xixi50ubv-1
-------------- next part --------------
=== modified file 'TODO'
--- a/TODO	2008-06-04 11:15:13 +0000
+++ b/TODO	2008-06-04 19:23:36 +0000
@@ -7,12 +7,10 @@
    currently running servers
 
 ** add a command to list the available servers (really ? taking
-   care of supporting OSes ? Hmmm, when time permits may be ;P
+   care of supporting OSes ? Hmmm, when time permits may be ;P)
 
 * server.py
 
-** reduce duplication between cherokee and lighttpd
-
 * config.py
 
 ** give better error messages for wrongly written config files

=== modified file 'configs/apache2.conf'
--- a/configs/apache2.conf	2008-06-04 14:18:44 +0000
+++ b/configs/apache2.conf	2008-06-04 19:23:36 +0000
@@ -13,36 +13,8 @@
 
 LockFile "%(var_lock_dir)s/accept.lock
 
-#
-# PidFile: The file in which the server should record its process
-# identification number when it starts.
-#
 PidFile %(pid_file)s
 
-#
-# Timeout: The number of seconds before receives and sends time out.
-#
-Timeout 10
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 20
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 5
-
 ErrorLog %(log_file)s
 LogFormat "%%h %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
 CustomLog %(var_log_dir)s/access.log combined
@@ -59,7 +31,7 @@
 MaxClients           5
 ThreadsPerChild      5
 
-# Tests will create a symlink named %(www_dir)s pointing to the
+# Tests will create symlinks in that directory to point to the
 # appropriate location
 DocumentRoot %(www_dir)s
 

=== modified file 'configs/cherokee.conf'
--- a/configs/cherokee.conf	2008-06-04 07:19:02 +0000
+++ b/configs/cherokee.conf	2008-06-04 19:23:36 +0000
@@ -9,38 +9,12 @@
 IPv6 Off
 Listen %(host)s
 
-Timeout 60
-
 KeepAlive On
 
-MaxKeepAliveRequests 10
-
-##
-## ServerTokens:  This directive configures what you return as the Server 
-## HTTP response Header. The default is 'Full' which sends information about
-## the OS-Type and compiled in modules.  Full conveys the most information, 
-## and Product the least.
-##
-## Product  -  Cherokee
-## Minor    -  Cherokee/0.0
-## Minimal  -  Cherokee/0.0.0
-## OS       -  Cherokee/0.0.0 (UNIX)
-## Full     -  Cherokee/0.0.0 (UNIX) Ext/0.0 Ext2/0.0
-##
-ServerTokens Full
-
-
-##
-## PidFile: The file in which the server should record its process
-## identification number when it starts.
-##
 PidFile %(pid_file)s
 
-
-#Include /etc/cherokee/advanced.conf
-#Include /etc/cherokee/mods-enabled
-#Include /etc/cherokee/sites-enabled
-
+# Tests will create symlinks in that directory to point to the
+# appropriate location
 DocumentRoot %(www_dir)s
 
 Log combined {

=== modified file 'configs/lighttpd.conf'
--- a/configs/lighttpd.conf	2008-06-04 14:18:44 +0000
+++ b/configs/lighttpd.conf	2008-06-04 19:23:36 +0000
@@ -3,7 +3,7 @@
 #
 # Debian lighttpd configuration file
 # 
-server.document-root       = "%(www_dir)s"
+
 server.modules              = ( 
             "mod_accesslog",
 )
@@ -20,6 +20,10 @@
 
 server.pid-file            = "%(pid_file)s"
 
+# Tests will create symlinks in that directory to point to the
+# appropriate location
+server.document-root       = "%(www_dir)s"
+
 # required for
 #bzrlib.tests.test_transport_implementations.TransportTests.test_has_root_works
 dir-listing.activate = "enable"