From f9a745046aa106b21de824c0fa85b3cd5eefb254 Mon Sep 17 00:00:00 2001 From: Chris Croome Date: Mon, 3 Dec 2018 14:49:02 +0000 Subject: [PATCH] conneg test, see #52 --- README.md | 4 ++-- _coops/htaccess | 16 ---------------- _services/htaccess | 16 ---------------- _technologies/htaccess | 16 ---------------- htaccess | 13 +------------ 5 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 _coops/htaccess delete mode 100644 _services/htaccess delete mode 100644 _technologies/htaccess diff --git a/README.md b/README.md index 854b356..3c64d9b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This is a port of the current Wordpress version of the [CoTech Website][] to a s ## Run the site locally You can run the site on your computer as if it were live online using Jekyll. You will need `git` and `ruby` installed on your machine to do this. Then clone the repository - + ### ... using docker Make sure you have [docker](https://docs.docker.com/install/) (CE is fine) installed and running, then: @@ -16,7 +16,7 @@ Make sure you have [docker](https://docs.docker.com/install/) (CE is fine) insta cd website git checkout dev ./dev - + And visit [localhost:4000](http://localhost:4000) to view the site. ### ... directly on your machine diff --git a/_coops/htaccess b/_coops/htaccess deleted file mode 100644 index 2ac0ab1..0000000 --- a/_coops/htaccess +++ /dev/null @@ -1,16 +0,0 @@ ---- -layout: none -permalink: .htaccess ---- -# Serve requests for /example using the files at /example.html -RewriteEngine on -RewriteCond %{REQUEST_FILENAME} !-d -RewriteCond %{REQUEST_FILENAME}\.html -f -RewriteRule ^(.*)$ $1.html - -# Redirect requests for /example.html to /example -RewriteCond %{REQUEST_FILENAME} !-d -RewriteCond %{REQUEST_FILENAME}\.html -f -RewriteCond %{REQUEST_URI} ^(.+)\.html$ -RewriteRule (.*)\.html$ /$1 [R=301,L] - diff --git a/_services/htaccess b/_services/htaccess deleted file mode 100644 index 2ac0ab1..0000000 --- a/_services/htaccess +++ /dev/null @@ -1,16 +0,0 @@ ---- -layout: none -permalink: .htaccess ---- -# Serve requests for /example using the files at /example.html -RewriteEngine on -RewriteCond %{REQUEST_FILENAME} !-d -RewriteCond %{REQUEST_FILENAME}\.html -f -RewriteRule ^(.*)$ $1.html - -# Redirect requests for /example.html to /example -RewriteCond %{REQUEST_FILENAME} !-d -RewriteCond %{REQUEST_FILENAME}\.html -f -RewriteCond %{REQUEST_URI} ^(.+)\.html$ -RewriteRule (.*)\.html$ /$1 [R=301,L] - diff --git a/_technologies/htaccess b/_technologies/htaccess deleted file mode 100644 index 2ac0ab1..0000000 --- a/_technologies/htaccess +++ /dev/null @@ -1,16 +0,0 @@ ---- -layout: none -permalink: .htaccess ---- -# Serve requests for /example using the files at /example.html -RewriteEngine on -RewriteCond %{REQUEST_FILENAME} !-d -RewriteCond %{REQUEST_FILENAME}\.html -f -RewriteRule ^(.*)$ $1.html - -# Redirect requests for /example.html to /example -RewriteCond %{REQUEST_FILENAME} !-d -RewriteCond %{REQUEST_FILENAME}\.html -f -RewriteCond %{REQUEST_URI} ^(.+)\.html$ -RewriteRule (.*)\.html$ /$1 [R=301,L] - diff --git a/htaccess b/htaccess index 2ac0ab1..279f04d 100644 --- a/htaccess +++ b/htaccess @@ -2,15 +2,4 @@ layout: none permalink: .htaccess --- -# Serve requests for /example using the files at /example.html -RewriteEngine on -RewriteCond %{REQUEST_FILENAME} !-d -RewriteCond %{REQUEST_FILENAME}\.html -f -RewriteRule ^(.*)$ $1.html - -# Redirect requests for /example.html to /example -RewriteCond %{REQUEST_FILENAME} !-d -RewriteCond %{REQUEST_FILENAME}\.html -f -RewriteCond %{REQUEST_URI} ^(.+)\.html$ -RewriteRule (.*)\.html$ /$1 [R=301,L] - +Options +MultiViews