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_drupal | |
| parent | c60153ac9850c9d3312db1f18abef60c495dee20 (diff) | |
we need to set the var also vor http parts
Diffstat (limited to 'templates/vhosts/php_drupal')
| -rw-r--r-- | templates/vhosts/php_drupal/php_drupal.erb | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/templates/vhosts/php_drupal/php_drupal.erb b/templates/vhosts/php_drupal/php_drupal.erb index 304e8b1..0e6faae 100644 --- a/templates/vhosts/php_drupal/php_drupal.erb +++ b/templates/vhosts/php_drupal/php_drupal.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') %> <%- if ssl_mode.to_s == 'force' then -%> @@ -13,10 +16,6 @@ RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L] <%- end -%> - <%- if default_charset.to_s != 'absent' then -%> - AddDefaultCharset <%= default_charset %> - - <%- end -%> <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%> <IfModule mpm_itk_module> AssignUserId <%= run_uid+" "+run_gid %> @@ -153,7 +152,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') %> @@ -174,10 +176,6 @@ <%- end -%> - <%- if default_charset.to_s != 'absent' then -%> - AddDefaultCharset <%= default_charset %> - - <%- end -%> <%- if run_mode.to_s == 'static-itk' then -%> <%- if not ssl_mode.to_s == 'force' then -%> <Directory "<%= documentroot %>/"> |