From 41d778fe47c20f2d4c37b4c3089d50fbac6535a3 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 18 Apr 2014 10:58:56 +0200
Subject: address puppet 3.x deprecation warnings

---
 templates/vhosts/php_silverstripe/partial.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates/vhosts/php_silverstripe')

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']) %>
 
-- 
cgit v1.2.3