summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2014-04-14 23:12:54 +0200
committermh <mh@immerda.ch>2014-04-14 23:12:54 +0200
commitad5af8623f3db9ea1e0d5b552b4cfc8276431f38 (patch)
treec48e4868de8e82f663dcf07fb25d41d30d89632a /templates
parent49d954d80d8b340dfcfdf939092d57754c3449f8 (diff)
only forward on https
Diffstat (limited to 'templates')
-rw-r--r--templates/vhosts/php_gallery2/partial.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/vhosts/php_gallery2/partial.erb b/templates/vhosts/php_gallery2/partial.erb
index 26d33ee..e17f0ec 100644
--- a/templates/vhosts/php_gallery2/partial.erb
+++ b/templates/vhosts/php_gallery2/partial.erb
@@ -5,12 +5,12 @@
<%= scope.function_template(['apache/vhosts/partials/authentication.erb']) %>
-<% if vhost_part != :ssl -%>
# Always rewrite login's
# Source: http://gallery.menalto.com/node/30558
RewriteEngine On
+ RewriteCond %{HTTPS} !=on
+ RewriteCond %{HTTP:X-Forwarded-Proto} !=https
RewriteCond %{HTTP_COOKIE} ^GALLERYSID= [OR]
RewriteCond %{QUERY_STRING} subView=core\.UserLogin
RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [NE,R,L]
-<% end -%>
</Directory>