Commit 1a8e501d authored by Łukasz Nowak's avatar Łukasz Nowak

- do not use configuration section in templates, use local part parameters

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36818 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a4e6a22c
No related merge requests found
......@@ -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 =
......
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@example.com
DocumentRoot "${configuration:httpd_htdocs}"
DocumentRoot "${:httpd_htdocs}"
<Directory />
Options FollowSymLinks
......@@ -95,7 +95,7 @@ DocumentRoot "${configuration:httpd_htdocs}"
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
<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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment