svn commit: r984423 - in /websites/staging/taverna/trunk: cgi-bin/ content/ content/.htaccess content/download/.htaccess

[bu...@apache.org]

Author: buildbot
Date: Fri Apr  1 13:36:05 2016
New Revision: 984423

Log:
Staging update by buildbot for taverna

Removed:
    websites/staging/taverna/trunk/content/download/.htaccess
Modified:
    websites/staging/taverna/trunk/cgi-bin/   (props changed)
    websites/staging/taverna/trunk/content/   (props changed)
    websites/staging/taverna/trunk/content/.htaccess

Propchange: websites/staging/taverna/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Apr  1 13:36:05 2016
@@ -1 +1 @@
-1737379
+1737384

Propchange: websites/staging/taverna/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Apr  1 13:36:05 2016
@@ -1 +1 @@
-1737379
+1737384

Modified: websites/staging/taverna/trunk/content/.htaccess
==============================================================================
--- websites/staging/taverna/trunk/content/.htaccess (original)
+++ websites/staging/taverna/trunk/content/.htaccess Fri Apr  1 13:36:05 2016
@@ -1,16 +1,45 @@
-Redirect /code/ /download/code/
-Redirect /code /download/code
+# Custom error page
 ErrorDocument 404 /error_pages/404.html
 
+
+
 RewriteEngine On
+
+# This trick is needed to avoid redirects exposing /var/www/html/
 RewriteBase /
 RewriteCond %{IS_SUBREQ} false
 
+# Correct hostname? We're still in the incubator..
+# (Swap this around after graduation)
+RewriteCond %{HTTP_HOST} taverna.apache.org
+RewriteRule .* https://taverna.incubator.apache.org%{REQUEST_URI} [L,R=302]
+
+# OK.. perhaps it's the right hostname.. but do we have https?
+RewriteCond %{HTTPS} off
+# .. so we don't redirect https://taverna.staging.apache.org/ (broken)
+RewriteCond %{HTTP_HOST} taverna.incubator.apache.org
+# Ensure https if we are on taverna.incubator.apache.org
+RewriteRule .* https://taverna.incubator.apache.org%{REQUEST_URI} [L,R=301]
+
+
+# This would have been nice - avoid exposing .html - but
+# it was a bit tricky to get to work properly..
+RewriteCond %{IS_SUBREQ} false
 #RewriteRule ^(.*)\.html$ $1 [L,R]
+
+RewriteCond %{IS_SUBREQ} false
 RewriteRule ^(.*)/index $1 [L,R]
+
+# Add redirects here for moved pages
+# and other short-form URIs
+# TIP: You can also use https://s.apache.org/
+# to create short URIs
+Redirect /code/ /download/code/
+Redirect /code /download/code
 RewriteRule ^community/contact.* /community/lists [L,R]
 RewriteRule ^contact.* /community/lists [L,R]
 RewriteRule ^edit.* /community/edit [L,R]
 RewriteRule ^doc/?$ /documentation/ [L,R]
 
 RewriteRule ^download/scufl2.* /download/language/ [L,R=permanent]
+