diff options
| author | mh <mh@immerda.ch> | 2014-04-19 16:49:43 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-04-19 16:49:43 +0200 |
| commit | 1ed74a3beb4498ed1566a94c49da3fb4c57cef0e (patch) | |
| tree | 9e40c8bfaef1e0966f7d5cef047b042504ba0669 /templates | |
| parent | 714d84fe978f1852c650756e1f044ffb5a7aff82 (diff) | |
combine the checks like this, otherwise we always redirect on security
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/vhosts/php_silverstripe/partial.erb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/templates/vhosts/php_silverstripe/partial.erb b/templates/vhosts/php_silverstripe/partial.erb index 8fb87e4..75a8193 100644 --- a/templates/vhosts/php_silverstripe/partial.erb +++ b/templates/vhosts/php_silverstripe/partial.erb @@ -2,16 +2,11 @@ RewriteEngine On RewriteCond %{HTTPS} !=on RewriteCond %{HTTP:X-Forwarded-Proto} !=https - RewriteRule /admin(.*) https://%{HTTP_HOST}/admin$1 [L,R,NE] - RewriteRule /Security(.*) https://%{HTTP_HOST}/Security$1 [L,R,NE] + RewriteRule /(Security|admin)(.*) https://%{HTTP_HOST}/admin$1$2 [L,R,NE] <Directory "<%= @documentroot %>/"> - <%= scope.function_template(['apache/vhosts/partials/std_override_options.erb']) %> - <%= scope.function_template(['apache/vhosts/partials/php_settings.erb']) %> - <%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %> - Include include.d/silverstripe.inc </Directory> |