[Erp5-report] r36819 luke - in /erp5/trunk/buildout: instance-profiles/ templates/

[nobody at svn.erp5.org]

Author: luke
Date: Fri Jul  2 18:28:00 2010
New Revision: 36819

URL: http://svn.erp5.org?rev=36819&view=rev
Log:
 - put all template variables inside of proper part

Modified:
    erp5/trunk/buildout/instance-profiles/apache.cfg
    erp5/trunk/buildout/templates/httpd.conf.in
    erp5/trunk/buildout/templates/httpd.in

Modified: erp5/trunk/buildout/instance-profiles/apache.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/apache.cfg?rev=36819&r1=36818&r2=36819&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/apache.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/apache.cfg [utf8] Fri Jul  2 18:28:00 2010
@@ -17,6 +17,8 @@ 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]
@@ -31,10 +33,14 @@ httpd_vhost_rewrite_rules = ${configurat
 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 =

Modified: erp5/trunk/buildout/templates/httpd.conf.in
URL: http://svn.erp5.org/erp5/trunk/buildout/templates/httpd.conf.in?rev=36819&r1=36818&r2=36819&view=diff
==============================================================================
--- erp5/trunk/buildout/templates/httpd.conf.in [utf8] (original)
+++ erp5/trunk/buildout/templates/httpd.conf.in [utf8] Fri Jul  2 18:28:00 2010
@@ -1,4 +1,4 @@
-ServerRoot "${software_definition:software_home}/parts/apache"
+ServerRoot "${:server_root}"
 
 #Listen 12.34.56.78:80
 Listen ${:httpd_port}
@@ -112,7 +112,7 @@ DocumentRoot "${:httpd_htdocs}"
     Satisfy All
 </FilesMatch>
 
-ErrorLog "${buildout:log-directory}/httpd/error_log"
+ErrorLog "${:error_log}"
 LogLevel warn
 
 <IfModule log_config_module>
@@ -124,7 +124,7 @@ LogLevel warn
       LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
     </IfModule>
 
-    CustomLog "${buildout:log-directory}/httpd/access_log" common
+    CustomLog "${:access_log}" common
 
 </IfModule>
 
@@ -156,4 +156,4 @@ SSLRandomSeed connect builtin
 
 ${:httpd_extra_conf}
 
-Include ${buildout:var-directory}/etc/*.vhost.conf
+Include ${:include_config}

Modified: erp5/trunk/buildout/templates/httpd.in
URL: http://svn.erp5.org/erp5/trunk/buildout/templates/httpd.in?rev=36819&r1=36818&r2=36819&view=diff
==============================================================================
--- erp5/trunk/buildout/templates/httpd.in [utf8] (original)
+++ erp5/trunk/buildout/templates/httpd.in [utf8] Fri Jul  2 18:28:00 2010
@@ -1,2 +1,2 @@
 #!/bin/bash
-${software_definition:software_home}/parts/apache/bin/httpd -f ${apache-conf:output} $*
+${:binary} -f ${:config-path} $*