diff --git a/.htaccess b/.htaccess index 4df450e..0847c80 100644 --- a/.htaccess +++ b/.htaccess @@ -4,9 +4,18 @@ RewriteRule ^docs/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}getting-starte RewriteRule ^docs/getting-started/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}quickstart/ [R] RewriteRule ^docs/best-practices/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}controllers/ [R] RewriteRule ^docs/api/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}app/ [R] -RewriteRule ^docs/async/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}promises/ [R] +RewriteRule ^docs/async/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}fibers/ [R] RewriteRule ^docs/integrations/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}database/ [R] -RewriteRule ^docs/more/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}philosophy/ [R] + +# redirect old "more" section (2021-11-23) +RewriteRule ^docs/more/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}../getting-started/philosophy/ [R] +RewriteRule ^docs/more/philosophy/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}../../getting-started/philosophy/ [R] +RewriteRule ^docs/more/architecture/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}../../getting-started/philosophy/ [R] +RewriteRule ^docs/more/community/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}../../getting-started/community/ [R] + +# redirect old "async" pages (2021-11-22) +RewriteRule ^docs/async/child-processes/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}../../integrations/child-processes/ [R] +RewriteRule ^docs/async/streaming/$ %{REQUEST_SCHEME}://%{HTTP_HOST}%{REQUEST_URI}../../integrations/streaming/ [R] RewriteCond %{REQUEST_FILENAME} -f RewriteRule ^(.*/?)index.html$ %{REQUEST_SCHEME}://%{HTTP_HOST}/$1 [R=301] diff --git a/README.md b/README.md index cac6b24..d4e9a1f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Framework X website [![CI status](https://github.com/clue/framework-x-website/workflows/Deploy/badge.svg)](https://github.com/clue/framework-x-website/actions) -![Last deployed on `live`](https://img.shields.io/github/last-commit/clue/framework-x-website/live?label=last%20deployed&logo=github) +[![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) Source code for the Framework X website. diff --git a/tests/acceptance.sh b/tests/acceptance.sh index 7cfd3d5..7e34df0 100755 --- a/tests/acceptance.sh +++ b/tests/acceptance.sh @@ -18,12 +18,19 @@ out=$(curl -v $base/docs/ 2>&1); match "HTTP/.* 302" && match out=$(curl -v $base/docs/getting-started/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/getting-started/quickstart/[\r\n]" out=$(curl -v $base/docs/best-practices/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/best-practices/controllers/[\r\n]" out=$(curl -v $base/docs/api/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/api/app/[\r\n]" -out=$(curl -v $base/docs/async/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/async/promises/[\r\n]" +out=$(curl -v $base/docs/async/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/async/fibers/[\r\n]" out=$(curl -v $base/docs/integrations/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/integrations/database/[\r\n]" -out=$(curl -v $base/docs/more/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/docs/more/philosophy/[\r\n]" out=$(curl -v $base/index.html 2>&1); match "HTTP/.* 301" && match -iP "Location: .*/[\r\n]" out=$(curl -v $base/docs/index.html 2>&1); match "HTTP/.* 301" && match -iP "Location: .*/docs/[\r\n]" out=$(curl -v $base/docs/getting-started/quickstart/index.html 2>&1); match "HTTP/.* 301" && match -iP "Location: .*/docs/getting-started/quickstart/[\r\n]" +out=$(curl -v $base/docs/more/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/\.\./getting-started/philosophy/[\r\n]" +out=$(curl -v $base/docs/more/philosophy/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/\.\./\.\./getting-started/philosophy/[\r\n]" +out=$(curl -v $base/docs/more/architecture/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/\.\./\.\./getting-started/philosophy/[\r\n]" +out=$(curl -v $base/docs/more/community/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/\.\./\.\./getting-started/community/[\r\n]" + +out=$(curl -v $base/docs/async/child-processes/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/\.\./\.\./integrations/child-processes/[\r\n]" +out=$(curl -v $base/docs/async/streaming/ 2>&1); match "HTTP/.* 302" && match -iP "Location: .*/\.\./\.\./integrations/streaming/[\r\n]" + echo "OK ($n)"