- put all template variables inside of proper part

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36819 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/instance-profiles/apache.cfg

@@ -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 = ${configuration:httpd_vhost_rewrite_rules}
 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 =

buildout/templates/httpd.conf.in

-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}

buildout/templates/httpd.in

 #!/bin/bash
-${software_definition:software_home}/parts/apache/bin/httpd -f ${apache-conf:output} $*
+${:binary} -f ${:config-path} $*