[Erp5-report] r41413 luke - /erp5/trunk/utils/erp5.recipe.apache/src/erp5/recipe/apache/tem...

[nobody at svn.erp5.org]

Author: luke
Date: Tue Dec 14 14:49:43 2010
New Revision: 41413

URL: http://svn.erp5.org?rev=41413&view=rev
Log:
 - sorted out some parameters and started removal of not needed modules

Modified:
    erp5/trunk/utils/erp5.recipe.apache/src/erp5/recipe/apache/templates/zope.conf.in

Modified: erp5/trunk/utils/erp5.recipe.apache/src/erp5/recipe/apache/templates/zope.conf.in
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.apache/src/erp5/recipe/apache/templates/zope.conf.in?rev=41413&r1=41412&r2=41413&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.apache/src/erp5/recipe/apache/templates/zope.conf.in [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.apache/src/erp5/recipe/apache/templates/zope.conf.in [utf8] Tue Dec 14 14:49:43 2010
@@ -1,37 +1,55 @@
 # Apache configuration file for Zope
 # Automatically generated
-<Location /%(path)s>
-  Order Deny,Allow
-  Deny from all
-  Allow from all
-</Location>
+
+# Basic server configuration
 PidFile "%(pid_file)s"
 LockFile "%(lock_file)s"
 Listen %(ip)s:%(port)s
+ServerName %(server_name)s
+ServerAdmin %(server_admin)s
+DefaultType text/plain
+TypesConfig conf/mime.types
+AddType application/x-compress .Z
+AddType application/x-gzip .gz .tgz
+
+# SSL Configuration
 SSLEngine %(ssl_state)s
 SSLCertificateFile %(ssl_certificate)s
 SSLCertificateKeyFile %(ssl_key)s
-ServerName %(server_name)s
-RewriteEngine On
+SSLRandomSeed startup builtin
+SSLRandomSeed connect builtin
+
+# Log configuration
+ErrorLog "%(error_log)s"
+LogLevel warn
+LogFormat "%%h %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
+LogFormat "%%h %%l %%u %%t \"%%r\" %%>s %%b" common
+CustomLog "%(access_log)s" common
+
+# Directory protection
+<Directory />
+    Options FollowSymLinks
+    AllowOverride None
+    Order deny,allow
+    Deny from all
+</Directory>
 
+# Path enabled
+<Location /%(path)s>
+  Order Deny,Allow
+  Deny from all
+  Allow from all
+</Location>
+
+# Magic of Zope related rewrite
+RewriteEngine On
 RewriteCond %%{SERVER_NAME} !%(regex_server_name)s
 RewriteRule . - [F,L]
-
 RewriteCond %%{SERVER_NAME} %(regex_server_name)s
 RewriteRule /%(path)s($|/.*) http://%(backend_ip)s:%(backend_port)s/VirtualHostBase/%(protocol)s/%%{SERVER_NAME}:%(port)s/%(backend_path)s/VirtualHostRoot/_vh_%(path)s$1 [L,P]
 
+# List of module
 LoadModule authz_host_module modules/mod_authz_host.so
-LoadModule cache_module modules/mod_cache.so
-LoadModule disk_cache_module modules/mod_disk_cache.so
-LoadModule dbd_module modules/mod_dbd.so
-LoadModule bucketeer_module modules/mod_bucketeer.so
-LoadModule dumpio_module modules/mod_dumpio.so
-LoadModule echo_module modules/mod_echo.so
-LoadModule case_filter_module modules/mod_case_filter.so
-LoadModule case_filter_in_module modules/mod_case_filter_in.so
-LoadModule ext_filter_module modules/mod_ext_filter.so
-LoadModule include_module modules/mod_include.so
-LoadModule filter_module modules/mod_filter.so
 LoadModule substitute_module modules/mod_substitute.so
 LoadModule charset_lite_module modules/mod_charset_lite.so
 LoadModule deflate_module modules/mod_deflate.so
@@ -63,27 +81,5 @@ LoadModule negotiation_module modules/mo
 LoadModule imagemap_module modules/mod_imagemap.so
 LoadModule alias_module modules/mod_alias.so
 LoadModule rewrite_module modules/mod_rewrite.so
-ServerAdmin %(server_admin)s
-
-<Directory />
-    Options FollowSymLinks
-    AllowOverride None
-    Order deny,allow
-    Deny from all
-</Directory>
-
-ErrorLog "%(error_log)s"
-LogLevel warn
 
-LogFormat "%%h %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
-LogFormat "%%h %%l %%u %%t \"%%r\" %%>s %%b" common
-CustomLog "%(access_log)s" common
 
-DefaultType text/plain
-
-TypesConfig conf/mime.types
-
-AddType application/x-compress .Z
-AddType application/x-gzip .gz .tgz
-SSLRandomSeed startup builtin
-SSLRandomSeed connect builtin