diff --git a/apache/manifests/debian.pp b/apache/manifests/debian.pp
index 98c96cb..28f100b 100644
--- a/apache/manifests/debian.pp
+++ b/apache/manifests/debian.pp
@@ -88,7 +88,7 @@ class apache::debian::server inherits apache::debian::common {
 }
 
 
-define apache::debian::site($aliases, $root, $redirect) {
+define apache::debian::site($aliases, $root, $redirect, $proxy) {
 
     if $name == "default" {
         $site_fqdn = $homename
@@ -100,7 +100,7 @@ define apache::debian::site($aliases, $root, $redirect) {
         $site_confdir = "/etc/apache2/sites-enabled/${site_fqdn}.d"
 
         if !$redirect {
-            if !$proxy {
+            if $proxy == "" {
                 if $root {
                     file { "/srv/www/http/${site_fqdn}":
                         ensure => link,
@@ -131,8 +131,8 @@ define apache::debian::site($aliases, $root, $redirect) {
     file { $site_conf:
         ensure => present,
         mode   => "0644",
-        owner  => root,
-        group  => root,
+        owner  => "root",
+        group  => "root",
         notify => Service["apache2"],
     }
 
@@ -140,26 +140,24 @@ define apache::debian::site($aliases, $root, $redirect) {
         File[$site_conf] {
             content => "<VirtualHost *:80>\n  ServerName ${site_fqdn}\n  Redirect permanent / ${redirect}\n</VirtualHost>\n",
         }
-    } elsif $proxy {
-        File[$site_conf] {
-            content => template("apache/proxy.http.conf.erb"),
-        }
     } else {
         File[$site_conf] {
             content => template("apache/site.http.conf.erb"),
         }
-        file { $site_confdir:
-            ensure  => directory,
-            mode    => "0644",
-            owner   => root,
-            group   => root,
-            purge   => true,
-            force   => true,
-            recurse => true,
-            source  => [ "puppet:///files/apache/sites/${site_fqdn}",
-                         "puppet:///modules/custom/empty", ],
-            before  => File[$site_conf],
-            notify  => Service["apache2"],
+        if $proxy == "" {
+            file { $site_confdir:
+                ensure  => directory,
+                mode    => "0644",
+                owner   => "root",
+                group   => "root",
+                purge   => true,
+                force   => true,
+                recurse => true,
+                source  => [ "puppet:///files/apache/sites/${site_fqdn}",
+                             "puppet:///modules/custom/empty", ],
+                before  => File[$site_conf],
+                notify  => Service["apache2"],
+            }
         }
     }
 
diff --git a/apache/manifests/redhat.pp b/apache/manifests/redhat.pp
index f72ce64..86eb500 100644
--- a/apache/manifests/redhat.pp
+++ b/apache/manifests/redhat.pp
@@ -57,7 +57,7 @@ define apache::redhat::site($aliases, $root, $redirect, $proxy) {
         $site_confdir = "/etc/httpd/site.http.d/${site_fqdn}.d"
 
         if !$redirect {
-            if !$proxy {
+            if $proxy == "" {
                 if $root {
                     file { "/srv/www/http/${site_fqdn}":
                         ensure => link,
@@ -98,26 +98,24 @@ define apache::redhat::site($aliases, $root, $redirect, $proxy) {
         File[$site_conf] {
             content => "<VirtualHost *:80>\n  ServerName ${site_fqdn}\n  Redirect permanent / ${redirect}\n</VirtualHost>\n",
         }
-    } elsif $proxy {
-        File[$site_conf] {
-            content => template("apache/proxy.http.conf.erb"),
-        }
     } else {
         File[$site_conf] {
             content => template("apache/site.http.conf.erb"),
         }
-        file { $site_confdir:
-            ensure  => directory,
-            mode    => "0644",
-            owner   => root,
-            group   => root,
-            purge   => true,
-            force   => true,
-            recurse => true,
-            source  => [ "puppet:///files/apache/sites/${site_fqdn}",
-                         "puppet:///modules/apache/emptysite", ],
-            before  => File[$site_conf],
-            notify  => Service["httpd"],
+        if $proxy == "" {
+            file { $site_confdir:
+                ensure  => directory,
+                mode    => "0644",
+                owner   => "root",
+                group   => "root",
+                purge   => true,
+                force   => true,
+                recurse => true,
+                source  => [ "puppet:///files/apache/sites/${site_fqdn}",
+                             "puppet:///modules/apache/emptysite", ],
+                before  => File[$site_conf],
+                notify  => Service["httpd"],
+            }
         }
     }
 
diff --git a/apache/templates/proxy.http.conf.erb b/apache/templates/proxy.http.conf.erb
deleted file mode 100644
index 06b4c83..0000000
--- a/apache/templates/proxy.http.conf.erb
+++ /dev/null
@@ -1,10 +0,0 @@
-<VirtualHost *:80>
-  ServerName <%= @site_fqdn %>
-<% if @aliases != "" -%>
-  ServerAlias <%= @aliases %>
-<% end -%>
-  ErrorLog /srv/www/log/http/<%= @site_fqdn %>/error_log
-  CustomLog /srv/www/log/http/<%= @site_fqdn %>/access_log combined
-  ProxyPass / <%= @proxy %>/
-  ProxyPassReverse / <%= @proxy %>/
-</VirtualHost>
diff --git a/apache/templates/site.http.conf.erb b/apache/templates/site.http.conf.erb
index 866939d..8624adb 100644
--- a/apache/templates/site.http.conf.erb
+++ b/apache/templates/site.http.conf.erb
@@ -5,6 +5,11 @@
 <% end -%>
   ErrorLog /srv/www/log/http/<%= @site_fqdn %>/error_log
   CustomLog /srv/www/log/http/<%= @site_fqdn %>/access_log combined
+<% if @proxy != "" -%>
+  ProxyPass / <%= @proxy %>/
+  ProxyPassReverse / <%= @proxy %>/
+<% else -%>
   DocumentRoot /srv/www/http/<%= @site_fqdn %>
   Include <%= @site_confdir %>/*.conf
+<% end -%>
 </VirtualHost>