From 1f570d4b3a36688ac0ffdc177b14557e4204385f Mon Sep 17 00:00:00 2001
From: Thomas Wood <thomas.wood09@imperial.ac.uk>
Date: Wed, 20 Apr 2016 12:50:25 +0100
Subject: [PATCH] Rename git repository from www-rw to psvg
Also put in permanent redirects for www-rw.doc.ic.ac.uk
Closes #4
---
.htaccess | 6 ++++++
README.md | 2 +-
ci/.htaccess | 5 +++--
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/.htaccess b/.htaccess
index de377bf..01aa0c8 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1 +1,7 @@
+CheckSpelling Off
+
+RewriteEngine on
+RewriteCond %{HTTP_HOST} !=psvg.doc.ic.ac.uk
+RewriteRule ^(.*)$ http://psvg.doc.ic.ac.uk/$1 [R=301]
+
ErrorDocument 404 /404.html
diff --git a/README.md b/README.md
index c22730e..f231c9d 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Program Specification & Verification Group Website: http://psvg.doc.ic.ac.uk/
[](https://gemnasium.com/6ba7afbbfda9adcba06f007cc565a29a)
-The source code for [this site](http://psvg.doc.ic.ac.uk) is [hosted on the DoC GitLab server](https://gitlab.doc.ic.ac.uk/resource-reasoning/www-rw.doc.ic.ac.uk),
+The source code for [this site](http://psvg.doc.ic.ac.uk) is [hosted on the DoC GitLab server](https://gitlab.doc.ic.ac.uk/resource-reasoning/psvg.doc.ic.ac.uk),
you should have access to edit it if a member of the resource-reasoning group.
**DO NOT EDIT THE SOURCE CODE IN `/vol/rr/www`, IT IS ALL REPLACED EACH TIME THE SITE IS REBUILT FROM VERSION CONTROL**
diff --git a/ci/.htaccess b/ci/.htaccess
index 66a8d06..d7b08b2 100644
--- a/ci/.htaccess
+++ b/ci/.htaccess
@@ -15,8 +15,9 @@ RewriteBase /ci/
RewriteRule ^([^/]+)$ $1/ [R,L]
# Force to HTTPS
-RewriteCond %{HTTPS} =off
-RewriteRule ^(.*)$ https://www-rw.doc.ic.ac.uk/ci/$1 [R=301,L]
+RewriteCond %{HTTPS} =off [OR]
+RewriteCond %{HTTP_HOST} !=psvg.doc.ic.ac.uk
+RewriteRule ^(.*)$ https://psvg.doc.ic.ac.uk/ci/$1 [R=301,L]
# Proxy through to the internal server
RewriteRule ^(.*)$ https://146.169.46.217/ci/$1 [P]
--
GitLab