Repository: incubator-freemarker-site Updated Branches: refs/heads/asf-site 59e356055 -> 74d914842
Changing official domain from freemarker.org to freemarker.apache.org Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/commit/9e406a34 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/tree/9e406a34 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/diff/9e406a34 Branch: refs/heads/asf-site Commit: 9e406a341e23db1dd34d70e15c71dc196208f0e9 Parents: 59e3560 Author: ddekany <[email protected]> Authored: Sat Nov 4 10:46:29 2017 +0100 Committer: ddekany <[email protected]> Committed: Sat Nov 4 10:46:29 2017 +0100 ---------------------------------------------------------------------- .htaccess | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker-site/blob/9e406a34/.htaccess ---------------------------------------------------------------------- diff --git a/.htaccess b/.htaccess index a683916..7bb94e8 100644 --- a/.htaccess +++ b/.htaccess @@ -11,7 +11,6 @@ RewriteEngine On RewriteBase / # Redirect to the canonical domain: -RewriteCond %{HTTP_HOST} ^www\.freemarker\.org$ [NC,OR] -RewriteCond %{HTTP_HOST} ^freemarker\.incubator\. [NC,OR] -RewriteCond %{HTTP_HOST} ^freemarker\.apache\. [NC] -RewriteRule ^(.*)$ http://freemarker.org/$1 [R=301,L] +RewriteCond %{HTTP_HOST} ^(www\.)?freemarker\.org$ [NC,OR] +RewriteCond %{HTTP_HOST} ^freemarker\.incubator\. [NC] +RewriteRule ^(.*)$ http://freemarker.apache.org/$1 [R=301,L]
