diff options
| author | mh <mh@immerda.ch> | 2008-12-05 18:07:46 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-12-05 18:07:46 +0000 |
| commit | ded5106de8e6fef521343f6db6662641992a3f0d (patch) | |
| tree | d5256a8a8faa33f25bce290b2cd5b2cb73234041 /templates | |
| parent | 8a2d1ed9ad20e2fec17432ac7720cda7760ad03e (diff) | |
fixed option decision, centos static is now link of openbsd, as we can use the same
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vhosts/perl/CentOS.erb | 2 | ||||
| -rw-r--r-- | templates/vhosts/php/CentOS.erb | 2 | ||||
| l---------[-rw-r--r--] | templates/vhosts/static/CentOS.erb | 26 |
3 files changed, 3 insertions, 27 deletions
diff --git a/templates/vhosts/perl/CentOS.erb b/templates/vhosts/perl/CentOS.erb index 92e703c..d2b768f 100644 --- a/templates/vhosts/perl/CentOS.erb +++ b/templates/vhosts/perl/CentOS.erb @@ -17,7 +17,7 @@ <%- end -%> <Directory "<%= documentroot %>/"> AllowOverride <%= allow_override %> - <%- unless options.to_s == 'absent' then -%> + <%- unless options.to_s == 'absent' or do_includes.to_s == 'true' then -%> Options <%= options %> <%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%>+Includes<%- end -%> <%- end -%> <%- unless htpasswd_file.to_s == 'absent' then -%> diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index cee935e..e89db77 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -12,7 +12,7 @@ <Directory "<%= documentroot %>/"> AllowOverride <%= allow_override %> - <%- unless options.to_s == 'absent' then -%> + <%- unless options.to_s == 'absent' or do_includes.to_s == 'true' then -%> Options <%= options %> <%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%>+Includes<%- end -%> <%- end -%> <%- unless htpasswd_file.to_s == 'absent' then -%> diff --git a/templates/vhosts/static/CentOS.erb b/templates/vhosts/static/CentOS.erb index e990f5e..58a2ba5 100644..120000 --- a/templates/vhosts/static/CentOS.erb +++ b/templates/vhosts/static/CentOS.erb @@ -1,25 +1 @@ -<VirtualHost *:80> - Include conf.d/defaults.inc - - ServerName <%= servername %> - <%- unless serveralias.to_s.empty? -%> - ServerAlias <%= serveralias %> - <%- end -%> - DocumentRoot <%= documentroot %> - - ErrorLog <%= logdir %>/error_log - CustomLog <%= logdir %>/access_log combined - - <Directory "<%= documentroot %>"> - AllowOverride <%= allow_override %> - Options <%= options %> <%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%>+Includes<%- end -%> - </Directory> - - <IfModule mod_security2.c> - SecRuleEngine <%= if mod_security.to_s == 'true' then "On" else "Off" end %> - </IfModule> - - <%- unless additional_options == 'absent' then -%> - <%= additional_options %> - <%- end -%> -</VirtualHost> +OpenBSD.erb
\ No newline at end of file |