diff options
| author | mh <mh@immerda.ch> | 2011-05-18 00:40:27 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2011-05-18 00:40:27 +0200 |
| commit | 7d5eae278c87136bc26f1d312b599b79f5782ee6 (patch) | |
| tree | d37941cf05e8986075a9f872ae8488df812fdcf8 /templates/vhosts/php_silverstripe | |
| parent | c60153ac9850c9d3312db1f18abef60c495dee20 (diff) | |
we need to set the var also vor http parts
Diffstat (limited to 'templates/vhosts/php_silverstripe')
| -rw-r--r-- | templates/vhosts/php_silverstripe/php_silverstripe.erb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/templates/vhosts/php_silverstripe/php_silverstripe.erb b/templates/vhosts/php_silverstripe/php_silverstripe.erb index 71da476..e72c603 100644 --- a/templates/vhosts/php_silverstripe/php_silverstripe.erb +++ b/templates/vhosts/php_silverstripe/php_silverstripe.erb @@ -4,7 +4,10 @@ <%- end -%> <%- unless ssl_mode.to_s == 'only' then -%> <VirtualHost *:80> -<%= scope.function_template('apache/vhosts/partials/header_default.erb') %> +<% scope.unsetvar('vhost_part') + scope.setvar('vhost_part',:normal) -%> + <%= scope.function_template('apache/vhosts/partials/header_default.erb') %> +<% scope.unsetvar('vhost_part') -%> <%= scope.function_template('apache/vhosts/partials/logs.erb') %> @@ -75,7 +78,6 @@ <%- unless ssl_mode.to_s == 'false' then -%> <VirtualHost *:443> - Include include.d/defaults.inc <% scope.unsetvar('vhost_part') scope.setvar('vhost_part',:ssl) -%> <%= scope.function_template('apache/vhosts/partials/header_default.erb') %> @@ -141,7 +143,10 @@ <IfDefine !HttpdLocal> <%- unless ssl_mode.to_s == 'only' then -%> <VirtualHost *:80> -<%= scope.function_template('apache/vhosts/partials/header_default.erb') %> +<% scope.unsetvar('vhost_part') + scope.setvar('vhost_part',:normal) -%> + <%= scope.function_template('apache/vhosts/partials/header_default.erb') %> +<% scope.unsetvar('vhost_part') -%> DirectoryIndex index.htm index.html index.php <%= scope.function_template('apache/vhosts/partials/logs.erb') %> |