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_joomla | |
| parent | c60153ac9850c9d3312db1f18abef60c495dee20 (diff) | |
we need to set the var also vor http parts
Diffstat (limited to 'templates/vhosts/php_joomla')
| -rw-r--r-- | templates/vhosts/php_joomla/php_joomla.erb | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/templates/vhosts/php_joomla/php_joomla.erb b/templates/vhosts/php_joomla/php_joomla.erb index 35532da..a0e013d 100644 --- a/templates/vhosts/php_joomla/php_joomla.erb +++ b/templates/vhosts/php_joomla/php_joomla.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') %> @@ -114,19 +117,11 @@ <IfDefine !HttpdLocal> <%- unless ssl_mode.to_s == 'only' then -%> <VirtualHost *:80> - Include include.d/defaults.inc - - ServerName <%= servername %> - <%- unless serveralias.to_s.empty? then -%> - ServerAlias <%= serveralias %> - <%- end -%> - <%- unless server_admin.to_s.empty? or server_admin.to_s == 'absent' then -%> - ServerAdmin <%= server_admin %> - <%- end -%> - <%- if run_mode.to_s == 'static-itk' -%> - DocumentRoot <%= documentroot %>/ +<% 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 - <%- end -%> <%= scope.function_template('apache/vhosts/partials/logs.erb') %> @@ -145,10 +140,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 == 'static-itk' then -%> <%- if not ssl_mode.to_s == 'force' then -%> <Directory "<%= documentroot %>/"> |