diff options
| author | mh <mh@immerda.ch> | 2014-04-18 10:58:56 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-04-18 10:58:56 +0200 |
| commit | 41d778fe47c20f2d4c37b4c3089d50fbac6535a3 (patch) | |
| tree | 7d88ed6ca5e7b1733204f624fef6d3ce92750a4c /templates/vhosts/php_silverstripe | |
| parent | d4a70a927e41c181aa07d467a2478db74439aadb (diff) | |
address puppet 3.x deprecation warnings
Diffstat (limited to 'templates/vhosts/php_silverstripe')
| -rw-r--r-- | templates/vhosts/php_silverstripe/partial.erb | 6 |
1 files changed, 3 insertions, 3 deletions
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']) %> |