[Erp5-report] r41549 luke - in /erp5/trunk/buildout: instance-profiles/apache.cfg templates/

Mon Dec 20 16:22:42 CET 2010

Author: luke
Date: Mon Dec 20 16:22:41 2010
New Revision: 41549

URL: http://svn.erp5.org?rev=41549&view=rev
Log:
 - create apache instance profile which gives example configuration of
   Zope apache frontend
 - remove templates, as they are not needed anymore

Removed:
    erp5/trunk/buildout/templates/
Modified:
    erp5/trunk/buildout/instance-profiles/apache.cfg

Modified: erp5/trunk/buildout/instance-profiles/apache.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/apache.cfg?rev=41549&r1=41548&r2=41549&view=diff
==============================================================================

--- erp5/trunk/buildout/instance-profiles/apache.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/apache.cfg [utf8] Mon Dec 20 16:22:41 2010
@@ -1,59 +1,14 @@
 [buildout]
-parts = apache-instance
+parts = zope-frontend
 
-[configuration]
-httpd_port = 8181
-#httpd_host = 127.0.0.1
-httpd_datadir = ${buildout:var-directory}/httpd
-httpd_htdocs = ${:httpd_datadir}/htdocs
-httpd_cgibin = ${:httpd_datadir}/cgi-bin
-httpd_vhost_rewrite_rules =
-  RewriteRule      ^/static(.*) ${configuration:httpd_htdocs}$1 [L]
-httpd_extra_conf = 
-  # Additional Configuration
-
-[apache-httpd]
-recipe = collective.recipe.template
-input = ${software_definition:software_home}/templates/httpd.in
-output = ${buildout:data-bin-directory}/httpd
-config-path = ${apache-conf:output}
-binary = ${software_definition:software_home}/parts/apache/bin/httpd
-mode = 755
-
-[apache-vhost]
-recipe = collective.recipe.template
-input = ${software_definition:software_home}/templates/httpd.vhost.conf.in
-output = ${buildout:var-directory}/etc/httpd.vhost.conf
-httpd_port = ${configuration:httpd_port}
-httpd_htdocs = ${configuration:httpd_htdocs}
-httpd_vhost_rewrite_rules = ${configuration:httpd_vhost_rewrite_rules}
-
-[apache-conf]
-recipe = collective.recipe.template
-input = ${software_definition:software_home}/templates/httpd.conf.in
-output = ${buildout:var-directory}/etc/httpd.conf
-server_root = ${software_definition:software_home}/parts/apache
-httpd_port = ${configuration:httpd_port}
-httpd_htdocs = ${configuration:httpd_htdocs}
-httpd_cgibin = ${configuration:httpd_cgibin}
-httpd_extra_conf = ${configuration:httpd_extra_conf}
-error_log = ${buildout:log-directory}/httpd/error_log
-access_log = ${buildout:log-directory}/httpd/access_log
-include_config = ${buildout:var-directory}/etc/*.vhost.conf
-
-[apache-instance]
-depends =
-  ${create-directories:command}
-  ${apache-httpd:output}
-  ${apache-conf:output}
-  ${apache-vhost:output}
-
-recipe = plone.recipe.command
-command =
-    mkdir -p ${configuration:httpd_htdocs}
-    mkdir -p ${configuration:httpd_cgibin}
-    mkdir -p ${buildout:log-directory}/httpd
-    [ -f ${configuration:httpd_htdocs}/index.html ] || echo "<html><body><h1>It works!</h1></body></html>" > ${configuration:httpd_htdocs}/index.html
-
-update-command = ${:command}
+[zope-frontend]
+recipe = erp5.recipe.apache
+httpd_binary = ${software_definition:software_home}/parts/apache/bin/httpd
+openssl_binary = ${software_definition:software_home}/parts/openssl/bin/openssl
+
+ip = 127.0.0.1
+port = 42080
+server_name = localhost
 
+backend_mapping =
+  127.0.0.1:18080/ /

