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

[nobody at svn.erp5.org]

Author: luke
Date: Fri Jul  2 18:14:53 2010
New Revision: 36818

URL: http://svn.erp5.org?rev=36818&view=rev
Log:
 - do not use configuration section in templates, use local part parameters

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

Modified: erp5/trunk/buildout/instance-profiles/apache.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/apache.cfg?rev=36818&r1=36817&r2=36818&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/apache.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/apache.cfg [utf8] Fri Jul  2 18:14:53 2010
@@ -23,11 +23,18 @@ mode = 755
 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
+httpd_port = ${configuration:httpd_port}
+httpd_htdocs = ${configuration:httpd_htdocs}
+httpd_cgibin = ${configuration:httpd_cgibin}
+httpd_extra_conf = ${configuration:httpd_extra_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=36818&r1=36817&r2=36818&view=diff
==============================================================================
--- erp5/trunk/buildout/templates/httpd.conf.in [utf8] (original)
+++ erp5/trunk/buildout/templates/httpd.conf.in [utf8] Fri Jul  2 18:14:53 2010
@@ -1,7 +1,7 @@
 ServerRoot "${software_definition:software_home}/parts/apache"
 
 #Listen 12.34.56.78:80
-Listen ${configuration:httpd_port}
+Listen ${:httpd_port}
 
 # LoadModule foo_module modules/mod_foo.so
 LoadModule authn_file_module modules/mod_authn_file.so
@@ -86,7 +86,7 @@ Group daemon
 
 ServerAdmin you at example.com
 
-DocumentRoot "${configuration:httpd_htdocs}"
+DocumentRoot "${:httpd_htdocs}"
 
 <Directory />
     Options FollowSymLinks
@@ -95,7 +95,7 @@ DocumentRoot "${configuration:httpd_htdo
     Deny from all
 </Directory>
 
-<Directory "${configuration:httpd_htdocs}">
+<Directory "${:httpd_htdocs}">
     Options Indexes FollowSymLinks
     AllowOverride None
     Order allow,deny
@@ -129,10 +129,10 @@ LogLevel warn
 </IfModule>
 
 <IfModule alias_module>
-    ScriptAlias /cgi-bin/ "${configuration:httpd_cgibin}"
+    ScriptAlias /cgi-bin/ "${:httpd_cgibin}"
 </IfModule>
 
-<Directory "${configuration:httpd_cgibin}">
+<Directory "${:httpd_cgibin}">
     AllowOverride None
     Options None
     Order allow,deny
@@ -154,6 +154,6 @@ SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 </IfModule>
 
-${configuration:httpd_extra_conf}
+${:httpd_extra_conf}
 
 Include ${buildout:var-directory}/etc/*.vhost.conf

Modified: erp5/trunk/buildout/templates/httpd.vhost.conf.in
URL: http://svn.erp5.org/erp5/trunk/buildout/templates/httpd.vhost.conf.in?rev=36818&r1=36817&r2=36818&view=diff
==============================================================================
--- erp5/trunk/buildout/templates/httpd.vhost.conf.in [utf8] (original)
+++ erp5/trunk/buildout/templates/httpd.vhost.conf.in [utf8] Fri Jul  2 18:14:53 2010
@@ -1,6 +1,6 @@
-<VirtualHost *:${configuration:httpd_port}>
+<VirtualHost *:${:httpd_port}>
   ServerName       localhost
-  DocumentRoot     ${configuration:httpd_htdocs}
+  DocumentRoot     ${:httpd_htdocs}
   HostnameLookups  Off
   UseCanonicalName Off
   ServerSignature  Off
@@ -8,7 +8,7 @@
   ProxyVia         on
   ProxyTimeout     1200
 
-${configuration:httpd_vhost_rewrite_rules}
+${:httpd_vhost_rewrite_rules}
 
   <Location "/">
     Order Allow,Deny