Skip to content

Commit 1c2cb3f

Browse files
authored
Merge pull request #16 from clue-labs/docs-structure
Set up redirects for new documentation structure
2 parents e38af8f + 1faea3d commit 1c2cb3f

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

.htaccess

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,18 @@ RewriteRule ^docs/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}getting-starte
44
RewriteRule ^docs/getting-started/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}quickstart/ [R]
55
RewriteRule ^docs/best-practices/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}controllers/ [R]
66
RewriteRule ^docs/api/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}app/ [R]
7-
RewriteRule ^docs/async/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}promises/ [R]
7+
RewriteRule ^docs/async/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}fibers/ [R]
88
RewriteRule ^docs/integrations/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}database/ [R]
9-
RewriteRule ^docs/more/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}philosophy/ [R]
9+
10+
# redirect old "more" section (2021-11-23)
11+
RewriteRule ^docs/more/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}../getting-started/philosophy/ [R]
12+
RewriteRule ^docs/more/philosophy/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}../../getting-started/philosophy/ [R]
13+
RewriteRule ^docs/more/architecture/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}../../getting-started/philosophy/ [R]
14+
RewriteRule ^docs/more/community/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}../../getting-started/community/ [R]
15+
16+
# redirect old "async" pages (2021-11-22)
17+
RewriteRule ^docs/async/child-processes/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}../../integrations/child-processes/ [R]
18+
RewriteRule ^docs/async/streaming/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}../../integrations/streaming/ [R]
1019

1120
RewriteCond %{REQUEST_FILENAME} -f
1221
RewriteRule ^(.*/?)index.html$ %{REQUEST_SCHEME}://%{HTTP_HOST}/$1 [R=301]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Framework X website
22

33
[![CI status](https://github.com/clue/framework-x-website/workflows/Deploy/badge.svg)](https://github.com/clue/framework-x-website/actions)
4-
![Last deployed on `live`](https://img.shields.io/github/last-commit/clue/framework-x-website/live?label=last%20deployed&logo=github)
4+
[![Last deployed on `live`](https://img.shields.io/github/last-commit/clue/framework-x-website/live?label=last%20deployed&logo=github)](https://github.com/clue/framework-x-website/tree/live)
55

66
Source code for the Framework X website.
77

tests/acceptance.sh

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,19 @@ out=$(curl -v $base/docs/ 2>&1); match "HTTP/.* 302" && match
1818
out=$(curl -v $base/docs/getting-started/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/getting-started/quickstart/[\r\n]"
1919
out=$(curl -v $base/docs/best-practices/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/best-practices/controllers/[\r\n]"
2020
out=$(curl -v $base/docs/api/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/api/app/[\r\n]"
21-
out=$(curl -v $base/docs/async/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/async/promises/[\r\n]"
21+
out=$(curl -v $base/docs/async/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/async/fibers/[\r\n]"
2222
out=$(curl -v $base/docs/integrations/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/integrations/database/[\r\n]"
23-
out=$(curl -v $base/docs/more/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/more/philosophy/[\r\n]"
2423

2524
out=$(curl -v $base/index.html 2>&1); match "HTTP/.* 301" && match -iP "Location: .*/[\r\n]"
2625
out=$(curl -v $base/docs/index.html 2>&1); match "HTTP/.* 301" && match -iP "Location: .*/docs/[\r\n]"
2726
out=$(curl -v $base/docs/getting-started/quickstart/index.html 2>&1); match "HTTP/.* 301" && match -iP "Location: .*/docs/getting-started/quickstart/[\r\n]"
2827

28+
out=$(curl -v $base/docs/more/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/\.\./getting-started/philosophy/[\r\n]"
29+
out=$(curl -v $base/docs/more/philosophy/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/\.\./\.\./getting-started/philosophy/[\r\n]"
30+
out=$(curl -v $base/docs/more/architecture/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/\.\./\.\./getting-started/philosophy/[\r\n]"
31+
out=$(curl -v $base/docs/more/community/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/\.\./\.\./getting-started/community/[\r\n]"
32+
33+
out=$(curl -v $base/docs/async/child-processes/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/\.\./\.\./integrations/child-processes/[\r\n]"
34+
out=$(curl -v $base/docs/async/streaming/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/\.\./\.\./integrations/streaming/[\r\n]"
35+
2936
echo "OK ($n)"

0 commit comments

Comments
 (0)