diff options
| author | Micah Anderson <micah@riseup.net> | 2015-04-17 15:32:01 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2015-04-17 15:32:01 -0400 |
| commit | 36fd84c3d17355afa05b519764c37a3e45efc40d (patch) | |
| tree | c6f5dbc4651875a147607c788b37c5c973573330 /templates/vhosts/php_typo3/partial.erb | |
| parent | ffa03fb9f13bcd78b7e22f47b224c5a7244328ef (diff) | |
| parent | 8074127b8d8913314c90c3fe6131d078a858f7b6 (diff) | |
Merge remote-tracking branch 'immerda/master'
Diffstat (limited to 'templates/vhosts/php_typo3/partial.erb')
| -rw-r--r-- | templates/vhosts/php_typo3/partial.erb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/templates/vhosts/php_typo3/partial.erb b/templates/vhosts/php_typo3/partial.erb index 5c06570..afb756d 100644 --- a/templates/vhosts/php_typo3/partial.erb +++ b/templates/vhosts/php_typo3/partial.erb @@ -1,10 +1,10 @@ <%= scope.function_template(['apache/vhosts/php/partial.erb']) %> - <Directory "<%= documentroot %>/typo3/"> - RewriteEngine on + <Directory "<%= @documentroot %>/typo3/"> + RewriteEngine on - # Rewrite URLs to https that go for the admin area - RewriteCond %{REMOTE_ADDR} !^127\.[0-9]+\.[0-9]+\.[0-9]+$ - RewriteCond %{HTTPS} !=on - RewriteCond %{REQUEST_URI} (.*/typo3/.*) - RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R] - </Directory> + # Rewrite URLs to https that go for the admin area + RewriteCond %{HTTPS} !=on + RewriteCond %{HTTP:X-Forwarded-Proto} !=https + RewriteCond %{REQUEST_URI} (.*/typo3/.*) + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [L,R,NE] + </Directory> |