address puppet 3.x deprecation warnings

25 files changed, 134 insertions, 172 deletions

diff --git a/manifests/vhost/php/gallery2.pp b/manifests/vhost/php/gallery2.pp
index d2f2e6a..78d5256 100644
--- a/manifests/vhost/php/gallery2.pp
+++ b/manifests/vhost/php/gallery2.pp
@@ -66,7 +66,6 @@ define apache::vhost::php::gallery2(
   $manage_config                    = true,
   $config_webwriteable              = false,
   $manage_directories               = true,
-  $upload_dir                       = 'present'
 ){
   $documentroot = $path ? {
     'absent' => $::operatingsystem ? {
@@ -75,73 +74,27 @@ define apache::vhost::php::gallery2(
     },
     default => "${path}/www"
   }
-  $gdatadir = $path ? {
-    'absent' => $::operatingsystem ? {
-      openbsd => "/var/www/htdocs/${name}/g2data",
-      default => "/var/www/vhosts/${name}/g2data"
-    },
-    default => "${path}/g2data"
-  }
-  if ($upload_dir == 'present') or ($upload_dir == 'absent') {
-    $real_upload_dir = $::operatingsystem ? {
-      openbsd => "/var/www/htdocs/${name}/upload",
-      default => "/var/www/vhosts/${name}/upload"
-    }
-  } else {
-    $real_upload_dir = $upload_dir
-  }
-  $ensure_dir = $ensure ? {
-    'present' => directory,
-    default   => absent
-  }
-  file{
-    $gdatadir:
-      ensure  => $ensure_dir,
-      owner   => $documentroot_owner,
-      group   => $documentroot_group,
-      mode    => '0660';
-    $real_upload_dir:
-      owner   => $documentroot_owner,
-      group   => $documentroot_group,
-      mode    => '0660';
-  }
-  if ($ensure == 'absent') or ($upload_dir == 'absent') {
-    File[$real_upload_dir]{
-      ensure => absent,
-      purge => true,
-      force => true,
-      recurse => true
-    }
-  } else {
-    File[$real_upload_dir]{
-      ensure => directory
+  $upload_dir = "/var/www/vhosts/${name}/data/upload"
+  $gdata_dir = "/var/www/vhosts/${name}/data/gdata"
+  if $ensure != 'absent' {
+    file{
+      $gdata_dir:
+        ensure  => 'directory',
+        owner   => $documentroot_owner,
+        group   => $documentroot_group,
+        mode    => '0660';
+      $upload_dir:
+        ensure  => 'directory',
+        owner   => $documentroot_owner,
+        group   => $documentroot_group,
+        mode    => '0660';
     }
   }
 
   $gallery_php_settings = {
-    safe_mode => 'Off',
+    safe_mode        => 'Off',
     output_buffering => 'Off',
   }
-
-  # php upload_tmp_dir
-  case $php_settings[upload_tmp_dir] {
-    '',undef: {
-      $php_settings[upload_tmp_dir] = "/var/www/upload_tmp_dir/${name}"
-    }
-  }
-  # php session_save_path
-  case $php_settings['session.save_path'] {
-    '',undef: {
-      $php_settings['session.save_path'] = "/var/www/session.save_path/${name}"
-    }
-  }
-
-  if $upload_dir != 'absent' {
-    $gallery_php_settings[open_basedir] = "${documentroot}:${php_settings[upload_tmp_dir]}:${php_settings['session.save_path']}:${gdatadir}:${real_upload_dir}"
-  } else {
-    $gallery_php_settings[open_basedir] = "${documentroot}:${php_settings[upload_tmp_dir]}:${php_settings['session.save_path']}:${gdatadir}"
-  }
-
   $real_php_settings = merge($gallery_php_settings,$php_settings)
 
   # create vhost configuration file
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index 160f638..c34e339 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -116,19 +116,15 @@ define apache::vhost::php::standard(
     $pear_path = ''
   }
 
-
-  $std_php_settings = {
-    engine              =>  'On',
-    upload_tmp_dir      => "/var/www/upload_tmp_dir/${name}",
-    'session.save_path' => "/var/www/session.save_path/${name}",
-    open_basedir        => "${smarty_path}${pear_path}${documentroot}:${real_path}/data:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}",
-    safe_mode           => 'On'
-  }
   if $logmode != 'nologs' {
-    $std_php_settings[error_log] = "${logdir}/php_error_log"
+    $php_error_log = "${logdir}/php_error_log"
+  } else {
+    $php_error_log = undef
   }
   if $run_mode == 'fcgid' {
-    $std_php_settings[safe_mode_gid] = 'On'
+    $safe_mode_gid = 'On'
+  } else {
+    $safe_mode_gid = undef
   }
 
   if has_key($php_settings,'safe_mode_exec_dir') {
@@ -148,7 +144,7 @@ define apache::vhost::php::standard(
     purge   => true,
   }
   if has_key($php_options,'safe_mode_exec_bins') {
-    $std_php_settings[safe_mode_exec_dir] = $php_safe_mode_exec_dir
+    $std_php_settings_safe_mode_exec_dir = $php_safe_mode_exec_dir
     $ensure_exec = $ensure ? {
       'present'  => directory,
       default    => 'absent',
@@ -165,19 +161,32 @@ define apache::vhost::php::standard(
         ensure  => $ensure,
         path    => $php_safe_mode_exec_dir;
     }
-  }else{
+  } else {
+    $std_php_settings_safe_mode_exec_dir = undef
     File[$php_safe_mode_exec_dir]{
       ensure => absent,
     }
   }
 
-  if !has_key($php_settings,'default_charset') {
-    if $default_charset != 'absent' {
-      $std_php_settings[default_charset] =  $default_charset ? {
-        'On'    => 'iso-8859-1',
-        default => $default_charset
-      }
+  if !has_key($php_settings,'default_charset') and ($default_charset != 'absent') {
+    $std_php_settings_default_charset =  $default_charset ? {
+      'On'    => 'iso-8859-1',
+      default => $default_charset
     }
+  } else {
+    $std_php_settings_default_charset = undef
+  }
+
+  $std_php_settings = {
+    engine              => 'On',
+    upload_tmp_dir      => "/var/www/upload_tmp_dir/${name}",
+    'session.save_path' => "/var/www/session.save_path/${name}",
+    open_basedir        => "${smarty_path}${pear_path}${documentroot}:${real_path}/data:/var/www/upload_tmp_dir/${name}:/var/www/session.save_path/${name}",
+    safe_mode           => 'On',
+    error_log           => $php_error_log,
+    safe_mode_gid       => $safe_mode_gid,
+    safe_mode_exec_dir  => $std_php_settings_safe_mode_exec_dir,
+    default_charset     => $std_php_settings_default_charset,
   }
 
   $real_php_settings = merge($std_php_settings,$php_settings)
diff --git a/templates/vhosts/default.erb b/templates/vhosts/default.erb
index e4bbd4f..bf6485c 100644
--- a/templates/vhosts/default.erb
+++ b/templates/vhosts/default.erb
@@ -1,5 +1,5 @@
 <%
-vhost_parts = case ssl_mode
+vhost_parts = case @ssl_mode
   when 'only' then [:ssl]
   when false,'false' then  [:normal]
   else [:normal,:ssl]
@@ -13,30 +13,30 @@ vhost_parts.each do |vhost_part| -%>
 
 <% if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
   <IfModule mpm_itk_module>
-      AssignUserId <%= run_uid+" "+run_gid %>
+    AssignUserId <%= "#{@run_uid} #{@run_gid}" %>
   </IfModule>
 
 <% elsif run_mode.to_s == 'fcgid' -%>
   <IfModule mod_fcgid.c>
-    SuexecUserGroup <%= run_uid+" "+run_gid %>
+    SuexecUserGroup <%= "#{@run_uid} #{@run_gid}" %>
     FcgidMaxRequestsPerProcess 5000
-    FCGIWrapper /var/www/mod_fcgid-starters/<%= name %>/<%= name %>-starter .<%= passing_extension %>
-    AddHandler fcgid-script .<%= passing_extension %>
+    FCGIWrapper /var/www/mod_fcgid-starters/<%= @name %>/<%= @name %>-starter .<%= @passing_extension %>
+    AddHandler fcgid-script .<%= @passing_extension %>
   </IfModule>
 
 <% end -%>
-<% if ssl_mode == 'force' && vhost_part == :normal -%>
+<% if @ssl_mode == 'force' && vhost_part == :normal -%>
   RewriteEngine On
   RewriteCond %{HTTPS} !=on
   RewriteCond %{HTTP:X-Forwarded-Proto} !=https
   RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
 <% end -%>
-<%= scope.function_templatewlv([template_partial, {'vhost_part' => vhost_part } ]) %>
-<% unless template_partial == 'apache/vhosts/itk_plus/partial.erb' -%>
+<%= scope.function_templatewlv([@template_partial, {'vhost_part' => vhost_part } ]) %>
+<% unless @template_partial == 'apache/vhosts/itk_plus/partial.erb' -%>
 <%= scope.function_template(['apache/vhosts/partials/mod_security.erb']) %>
 <% end -%>
-<% unless additional_options.to_s == 'absent' -%>
-  <%= additional_options %>
+<% unless @additional_options.to_s == 'absent' -%>
+  <%= @additional_options %>
 <% end -%>
 </VirtualHost>
 <% end -%>
diff --git a/templates/vhosts/gitweb/partial.erb b/templates/vhosts/gitweb/partial.erb
index 35c574e..d7765bf 100644
--- a/templates/vhosts/gitweb/partial.erb
+++ b/templates/vhosts/gitweb/partial.erb
@@ -1,8 +1,8 @@
-  SetEnv GITWEB_CONFIG <%= gitweb_config %>
+  SetEnv GITWEB_CONFIG <%= @gitweb_config %>
   DirectoryIndex gitweb.cgi
-  <Directory "<%= documentroot %>/">
-<% if options.to_s != 'absent' || do_includes.to_s == 'true'-%>
-    Options <% unless options.to_s == 'absent' -%><%= options %><% end -%><% if do_includes.to_s == 'true' && !options.include?('+Includes') -%> +Includes<% end -%><% unless options.include?('+ExecCGI') -%> +ExecCGI<% end -%>
+  <Directory "<%= @documentroot %>/">
+<% if @options.to_s != 'absent' || @do_includes.to_s == 'true'-%>
+    Options <% unless @options.to_s == 'absent' -%><%= @options %><% end -%><% if @do_includes.to_s == 'true' && !@options.include?('+Includes') -%> +Includes<% end -%><% unless @options.include?('+ExecCGI') -%> +ExecCGI<% end -%>
 <% end -%>
 
     AddHandler cgi-script .cgi
diff --git a/templates/vhosts/itk_plus/partial.erb b/templates/vhosts/itk_plus/partial.erb
index 39aa6c8..78e8d27 100644
--- a/templates/vhosts/itk_plus/partial.erb
+++ b/templates/vhosts/itk_plus/partial.erb
@@ -4,25 +4,25 @@
 <% if vhost_part == :ssl -%>
   SSLProxyEngine On
 <%   if run_mode.to_s == 'static-itk' -%>
-  ProxyPassMatch ^/(.*\.<%= passing_extension %>/?.*)$ https://127.0.0.1/$1
+  ProxyPassMatch ^/(.*\.<%= @passing_extension %>/?.*)$ https://127.0.0.1/$1
 <%   else -%>
   ProxyPass / https://127.0.0.1/
 <%   end -%>
   ProxyPassReverse / https://127.0.0.1/
 <% else -%>
 <%   if run_mode.to_s == 'static-itk' -%>
-  ProxyPassMatch ^/(.*\.<%= passing_extension %>/?.*)$ http://127.0.0.1/$1
+  ProxyPassMatch ^/(.*\.<%= @passing_extension %>/?.*)$ http://127.0.0.1/$1
 <%   else -%>
   ProxyPass / http://127.0.0.1/
 <%   end -%>
   ProxyPassReverse / http://127.0.0.1/
 <% end -%>
 
-<% if run_mode.to_s == 'static-itk' && (ssl_mode.to_s != 'force' || vhost_part == :ssl) -%>
-  <Directory "<%= documentroot %>/">
-    AllowOverride <%= allow_override %>
-<%   if options.to_s != 'absent' or do_includes.to_s == 'true' -%>
-    Options <% unless options.to_s == 'absent' -%><%= options %><% end -%><% if do_includes.to_s == 'true' and not options.include?('+Includes') -%> +Includes<% end -%>
+<% if @run_mode.to_s == 'static-itk' && (@ssl_mode.to_s != 'force' || vhost_part == :ssl) -%>
+  <Directory "<%= @documentroot %>/">
+    AllowOverride <%= @allow_override %>
+<%   if @options.to_s != 'absent' || @do_includes.to_s == 'true' -%>
+    Options <% unless @options.to_s == 'absent' -%><%= @options %><% end -%><% if @do_includes.to_s == 'true' && !@options.include?('+Includes') -%> +Includes<% end -%>
 
 <%   end -%>
 <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %>
diff --git a/templates/vhosts/partials/authentication.erb b/templates/vhosts/partials/authentication.erb
index bf43a58..ed83221 100644
--- a/templates/vhosts/partials/authentication.erb
+++ b/templates/vhosts/partials/authentication.erb
@@ -1,6 +1,6 @@
-<% unless htpasswd_file.to_s == 'absent' -%>
+<% unless @htpasswd_file.to_s == 'absent' -%>
     AuthType Basic
-    AuthName "Access fuer <%= servername %>"
-    AuthUserFile <%= real_htpasswd_path %>
+    AuthName "Access fuer <%= @servername %>"
+    AuthUserFile <%= @real_htpasswd_path %>
     require valid-user
 <% end -%>
diff --git a/templates/vhosts/partials/header_default.erb b/templates/vhosts/partials/header_default.erb
index 398b0ce..dbba367 100644
--- a/templates/vhosts/partials/header_default.erb
+++ b/templates/vhosts/partials/header_default.erb
@@ -2,19 +2,19 @@
 <% if vhost_part == :ssl -%>
   Include include.d/ssl_defaults.inc
 <% end -%>
-  ServerName <%= servername %>
-<% unless serveralias.empty? || (serveralias == 'absent') -%>
-  ServerAlias <%= Array(serveralias).join(' ') %>
+  ServerName <%= @servername %>
+<% unless @serveralias.empty? || (@serveralias == 'absent') -%>
+  ServerAlias <%= Array(@serveralias).join(' ') %>
 <% end -%>
-<% unless server_admin.empty? || (server_admin == 'absent') -%>
-  ServerAdmin <%= server_admin %>
+<% unless @server_admin.empty? || (@server_admin == 'absent') -%>
+  ServerAdmin <%= @server_admin %>
 <% end -%>
-<% unless documentroot == 'really_absent' -%>
-  DocumentRoot <%= documentroot %>/
+<% unless @documentroot == 'really_absent' -%>
+  DocumentRoot <%= @documentroot %>/
 <% end -%>
-<% if default_charset != 'absent' -%>
-  AddDefaultCharset <%= default_charset %>
+<% if @default_charset != 'absent' -%>
+  AddDefaultCharset <%= @default_charset %>
 <% end -%>
-<% if passing_extension != 'absent' -%>
-  DirectoryIndex index.htm index.html index.<%= passing_extension %>
+<% if @passing_extension != 'absent' -%>
+  DirectoryIndex index.htm index.html index.<%= @passing_extension %>
 <% end -%>
diff --git a/templates/vhosts/partials/logs.erb b/templates/vhosts/partials/logs.erb
index 98c834d..136508f 100644
--- a/templates/vhosts/partials/logs.erb
+++ b/templates/vhosts/partials/logs.erb
@@ -1,18 +1,18 @@
-<% case logmode.to_s
+<% case @logmode.to_s
       when 'nologs' -%>
   ErrorLog /dev/null
   CustomLog /dev/null
 <% when 'noaccess' -%>
-  ErrorLog <%= logdir %>/<%= logprefix %>error_log
+  ErrorLog <%= @logdir %>/<%= @logprefix %>error_log
   CustomLog /dev/null noip
 <% when 'semianonym' -%>
-  ErrorLog <%= logdir %>/<%= logprefix %>error_log
-  CustomLog <%= logdir %>/<%= logprefix %>access_log noip
+  ErrorLog <%= @logdir %>/<%= @logprefix %>error_log
+  CustomLog <%= @logdir %>/<%= @logprefix %>access_log noip
 <% when 'anonym' -%>
   ErrorLog /dev/null
-  CustomLog <%= logdir %>/<%= logprefix %>access_log noip
+  CustomLog <%= @logdir %>/<%= @logprefix %>access_log noip
 <% else -%>
-  ErrorLog <%= logdir %>/<%= logprefix %>error_log
-  CustomLog <%= logdir %>/<%= logprefix %>access_log combined
+  ErrorLog <%= @logdir %>/<%= @logprefix %>error_log
+  CustomLog <%= @logdir %>/<%= @logprefix %>access_log combined
 <% end -%>
 
diff --git a/templates/vhosts/partials/mod_security.erb b/templates/vhosts/partials/mod_security.erb
index f0602d8..380e78f 100644
--- a/templates/vhosts/partials/mod_security.erb
+++ b/templates/vhosts/partials/mod_security.erb
@@ -1,7 +1,7 @@
   <IfModule mod_security2.c>
-<% if mod_security.to_s == 'true' -%>
+<% if @mod_security.to_s == 'true' -%>
     SecRuleEngine On
-<%   if mod_security_relevantonly.to_s == 'true' -%>
+<%   if @mod_security_relevantonly.to_s == 'true' -%>
     SecAuditEngine RelevantOnly
 <%   else -%>
     SecAuditEngine On
@@ -11,17 +11,17 @@
     SecAuditEngine Off
 <% end -%>
     SecAuditLogType Concurrent
-    SecAuditLogStorageDir <%= logdir %>/
-    SecAuditLog <%= logdir %>/mod_security_audit.log
-    SecDebugLog <%= logdir %>/mod_security_debug.log
-<% unless mod_security_rules_to_disable.to_a.empty? -%>
+    SecAuditLogStorageDir <%= @logdir %>/
+    SecAuditLog <%= @logdir %>/mod_security_audit.log
+    SecDebugLog <%= @logdir %>/mod_security_debug.log
+<% unless (disabled_rules=Array(@mod_security_rules_to_disable)).empty? -%>
 
-<%   mod_security_rules_to_disable.to_a.each do |rule| -%>
+<%    disabled_rules.each do |rule| -%>
     SecRuleRemoveById "<%= rule %>"
 <%   end -%>
 <% end -%>
-<% unless mod_security_additional_options.to_s == 'absent' -%>
+<% unless (s=@mod_security_additional_options).to_s == 'absent' -%>
 
-    <%= mod_security_additional_options %>
+    <%= s %>
 <% end -%>
   </IfModule>
diff --git a/templates/vhosts/partials/php_settings.erb b/templates/vhosts/partials/php_settings.erb
index fe55967..74f6ecf 100644
--- a/templates/vhosts/partials/php_settings.erb
+++ b/templates/vhosts/partials/php_settings.erb
@@ -1,6 +1,6 @@
-<% if run_mode != 'fcgid'
-  php_settings.reject{|k,v| v == :undef }.keys.sort.each do |key|
-    dvalue = php_settings[key].to_s.downcase
+<% if @run_mode != 'fcgid'
+  @php_settings.reject{|k,v| (v == :undef) || v.nil? }.keys.sort.each do |key|
+    dvalue = @php_settings[key].to_s.downcase
     munged_value = if dvalue == 'true'
        'on'
       elsif dvalue == 'false'
@@ -8,7 +8,7 @@
       elsif ['on','off'].include?(dvalue)
         dvalue
       else
-        php_settings[key]
+        @php_settings[key]
       end
 
        if ['on','off' ].include?(munged_value) -%>
diff --git a/templates/vhosts/partials/std_override_options.erb b/templates/vhosts/partials/std_override_options.erb
index f35354d..6d8b74f 100644
--- a/templates/vhosts/partials/std_override_options.erb
+++ b/templates/vhosts/partials/std_override_options.erb
@@ -1,4 +1,4 @@
-    AllowOverride <%= allow_override %>
-<% if options.to_s != 'absent' || do_includes.to_s == 'true' || run_mode == 'fcgid' -%>
-    Options <%- unless options.to_s == 'absent' then -%><%= options %><% end -%><% if do_includes.to_s == 'true' && !options.include?('+Includes') -%> +Includes<% end -%><% if run_mode == 'fcgid' && !options.include?('+ExecCGI') -%> +ExecCGI<% end -%>
+    AllowOverride <%= @allow_override %>
+<% if @options.to_s != 'absent' || @do_includes.to_s == 'true' || @run_mode == 'fcgid' -%>
+    Options <%- unless @options.to_s == 'absent' -%><%= @options %><% end -%><% if @do_includes.to_s == 'true' && !@options.include?('+Includes') -%> +Includes<% end -%><% if @run_mode == 'fcgid' && !@options.include?('+ExecCGI') -%> +ExecCGI<% end -%>
 <% end -%>
diff --git a/templates/vhosts/passenger/partial.erb b/templates/vhosts/passenger/partial.erb
index 2f4a068..c3b63f5 100644
--- a/templates/vhosts/passenger/partial.erb
+++ b/templates/vhosts/passenger/partial.erb
@@ -1,7 +1,7 @@
-  SetEnv GEM_HOME <%= gempath %>
-  <Directory <%= documentroot %>/>
-    AllowOverride <%= allow_override %>
-    Options <%- unless options.to_s == 'absent' -%><%= options %><%- end -%><%- unless !options.to_s.include?('MultiViews') -%>-MultiViews<%- end -%>
+  SetEnv GEM_HOME <%= @gempath %>
+  <Directory <%= @documentroot %>/>
+    AllowOverride <%= @allow_override %>
+    Options <%- unless @options.to_s == 'absent' -%><%= @options %><%- end -%><%- unless !@options.to_s.include?('MultiViews') -%>-MultiViews<%- end -%>
 
 <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %>
   </Directory>
diff --git a/templates/vhosts/perl/partial.erb b/templates/vhosts/perl/partial.erb
index 888c268..7ed3e71 100644
--- a/templates/vhosts/perl/partial.erb
+++ b/templates/vhosts/perl/partial.erb
@@ -1,15 +1,15 @@
-  <Directory "<%= documentroot %>/">
+  <Directory "<%= @documentroot %>/">
 <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %>
 
 <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %>
   </Directory>
 
-<% unless htpasswd_file.to_s == 'absent' -%>
-  <Directory "<%= cgi_binpath %>/">
+<% unless @htpasswd_file.to_s == 'absent' -%>
+  <Directory "<%= @cgi_binpath %>/">
     AuthType Basic
-    AuthName "Access fuer <%= servername %>"
-    AuthUserFile <%= real_htpasswd_path %>
+    AuthName "Access fuer <%= @servername %>"
+    AuthUserFile <%= @real_htpasswd_path %>
     require valid-user
   </Directory>
 <% end -%>
- ScriptAlias /cgi-bin/ <%= cgi_binpath %>/
+ ScriptAlias /cgi-bin/ <%= @cgi_binpath %>/
diff --git a/templates/vhosts/php/partial.erb b/templates/vhosts/php/partial.erb
index 1c75d48..82df269 100644
--- a/templates/vhosts/php/partial.erb
+++ b/templates/vhosts/php/partial.erb
@@ -1,4 +1,4 @@
-  <Directory "<%= documentroot %>/">
+  <Directory "<%= @documentroot %>/">
 <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %>
 
 <%= scope.function_template(['apache/vhosts/partials/php_settings.erb']) %>
diff --git a/templates/vhosts/php_drupal/partial.erb b/templates/vhosts/php_drupal/partial.erb
index 959e9d1..2c5f562 100644
--- a/templates/vhosts/php_drupal/partial.erb
+++ b/templates/vhosts/php_drupal/partial.erb
@@ -1,4 +1,4 @@
-  <Directory "<%= documentroot %>/">
+  <Directory "<%= @documentroot %>/">
 <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %>
 
 <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %>
@@ -18,7 +18,7 @@
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
   </Directory>
-  <Directory "<%= documentroot %>/files/">
+  <Directory "<%= @documentroot %>/files/">
     SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
     Options None
     Options +FollowSymLinks
diff --git a/templates/vhosts/php_gallery2/partial.erb b/templates/vhosts/php_gallery2/partial.erb
index e17f0ec..000f969 100644
--- a/templates/vhosts/php_gallery2/partial.erb
+++ b/templates/vhosts/php_gallery2/partial.erb
@@ -1,4 +1,4 @@
-  <Directory "<%= documentroot %>/">
+  <Directory "<%= @documentroot %>/">
 <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %>
 
 <%= scope.function_template(['apache/vhosts/partials/php_settings.erb']) %>
diff --git a/templates/vhosts/php_joomla/partial.erb b/templates/vhosts/php_joomla/partial.erb
index 64e73a9..5a0f720 100644
--- a/templates/vhosts/php_joomla/partial.erb
+++ b/templates/vhosts/php_joomla/partial.erb
@@ -1,4 +1,4 @@
-  <Directory "<%= documentroot %>/">
+  <Directory "<%= @documentroot %>/">
 <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %>
 
 <%= scope.function_template(['apache/vhosts/partials/php_settings.erb']) %> 
@@ -8,7 +8,7 @@
     Include include.d/joomla.inc
   </Directory>
 
-  <Directory "<%= documentroot %>/administrator/">
+  <Directory "<%= @documentroot %>/administrator/">
     RewriteEngine on
 
     # Rewrite URLs to https that go for the admin area
@@ -20,13 +20,13 @@
 
   # Deny various directories that
   # shouldn't be webaccessible
-  <Directory "<%= documentroot %>/tmp/">
+  <Directory "<%= @documentroot %>/tmp/">
     Deny From All
   </Directory>
-  <Directory "<%= documentroot %>/logs/">
+  <Directory "<%= @documentroot %>/logs/">
     Deny From All
   </Directory>
-  <Directory "<%= documentroot %>/cli/">
+  <Directory "<%= @documentroot %>/cli/">
     Deny From All
   </Directory>
 
diff --git a/templates/vhosts/php_mediawiki/partial.erb b/templates/vhosts/php_mediawiki/partial.erb
index 4a37aec..1ed6ee3 100644
--- a/templates/vhosts/php_mediawiki/partial.erb
+++ b/templates/vhosts/php_mediawiki/partial.erb
@@ -1,4 +1,4 @@
-<% if run_mode == 'fcgid' -%>
+<% if @run_mode == 'fcgid' -%>
   RewriteEngine On
   RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
   RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-d
diff --git a/templates/vhosts/php_silverstripe/partial.erb b/templates/vhosts/php_silverstripe/partial.erb
index b57fd1e..8fb87e4 100644
--- a/templates/vhosts/php_silverstripe/partial.erb
+++ b/templates/vhosts/php_silverstripe/partial.erb
@@ -2,10 +2,10 @@
   RewriteEngine On
   RewriteCond %{HTTPS} !=on
   RewriteCond %{HTTP:X-Forwarded-Proto} !=https
-  RewriteRule /admin(.*) https://<%= servername %>/admin$1 [L,R,NE]
-  RewriteRule /Security(.*) https://<%= servername %>/Security$1 [L,R,NE]
+  RewriteRule /admin(.*) https://%{HTTP_HOST}/admin$1 [L,R,NE]
+  RewriteRule /Security(.*) https://%{HTTP_HOST}/Security$1 [L,R,NE]
 
-  <Directory "<%= documentroot %>/">
+  <Directory "<%= @documentroot %>/">
 
 <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %>
 
diff --git a/templates/vhosts/php_typo3/partial.erb b/templates/vhosts/php_typo3/partial.erb
index 89f2f60..edb2966 100644
--- a/templates/vhosts/php_typo3/partial.erb
+++ b/templates/vhosts/php_typo3/partial.erb
@@ -1,5 +1,5 @@
 <%= scope.function_template(['apache/vhosts/php/partial.erb']) %>
-  <Directory "<%= documentroot %>/typo3/">
+  <Directory "<%= @documentroot %>/typo3/">
     RewriteEngine on
 
     # Rewrite URLs to https that go for the admin area
diff --git a/templates/vhosts/php_wordpress/partial.erb b/templates/vhosts/php_wordpress/partial.erb
index 00e1fcd..42f3cb5 100644
--- a/templates/vhosts/php_wordpress/partial.erb
+++ b/templates/vhosts/php_wordpress/partial.erb
@@ -1,6 +1,6 @@
 <%= scope.function_template(['apache/vhosts/php/partial.erb']) %>
 
   # fixes: http://git.zx2c4.com/w3-total-fail/tree/w3-total-fail.sh
-  <Directory "<%= documentroot %>/wp-content/w3tc/dbcache">
+  <Directory "<%= @documentroot %>/wp-content/w3tc/dbcache">
     Deny From All
   </Directory>
diff --git a/templates/vhosts/proxy/partial.erb b/templates/vhosts/proxy/partial.erb
index ec84dd4..0eecf82 100644
--- a/templates/vhosts/proxy/partial.erb
+++ b/templates/vhosts/proxy/partial.erb
@@ -4,5 +4,5 @@
 <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %>
   </Proxy>
   ProxyRequests Off
-  ProxyPass        /   <%= options %>/
-  ProxyPassReverse /   <%= options %>/
+  ProxyPass        /   <%= @options %>/
+  ProxyPassReverse /   <%= @options %>/
diff --git a/templates/vhosts/redirect/partial.erb b/templates/vhosts/redirect/partial.erb
index f6b76e6..c8d7d11 100644
--- a/templates/vhosts/redirect/partial.erb
+++ b/templates/vhosts/redirect/partial.erb
@@ -1 +1 @@
-  Redirect permanent / https://<%= options %>
+  Redirect permanent / https://<%= @options %>
diff --git a/templates/vhosts/static/partial.erb b/templates/vhosts/static/partial.erb
index 3b40a96..ae8743f 100644
--- a/templates/vhosts/static/partial.erb
+++ b/templates/vhosts/static/partial.erb
@@ -1,4 +1,4 @@
-  <Directory "<%= documentroot %>/">
+  <Directory "<%= @documentroot %>/">
 <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %>
 
 <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %>
diff --git a/templates/vhosts/webdav/partial.erb b/templates/vhosts/webdav/partial.erb
index b97e128..09ce632 100644
--- a/templates/vhosts/webdav/partial.erb
+++ b/templates/vhosts/webdav/partial.erb
@@ -1,16 +1,16 @@
-  DAVLockDB <%= real_dav_db_dir %>/DAVLock
-  <Directory "<%= documentroot %>/">
+  DAVLockDB <%= @real_dav_db_dir %>/DAVLock
+  <Directory "<%= @documentroot %>/">
     Dav on
     AllowOverride None
-<% if options.to_s != 'absent' or do_includes.to_s == 'true' -%>
-    Options <%- unless options.to_s == 'absent' -%><%= options %><%- end -%><%- unless options.include?('Indexes') -%> Indexes<%- end -%>
+<% if @options.to_s != 'absent' || @do_includes.to_s == 'true' -%>
+    Options <% unless @options.to_s == 'absent' -%><%= @options %><% end -%><% unless @options.include?('Indexes') -%> Indexes<%- end -%>
 
 <% else -%>
     Options Indexes
 
 <% end -%>
 <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %>
-<% if ldap_auth.to_s == 'true' then -%>
+<% if @ldap_auth.to_s == 'true' then -%>
     Include include.d/ldap_auth.inc
 <%   unless ldap_user.to_s == 'any' -%>
     Require ldap-user <%= ldap_user.to_s %>