[cc-commits] [CC SVN] r12886 - ccwordpress/trunk/conf

webmaster at creativecommons.org webmaster at creativecommons.org
Wed Jul 8 12:21:10 EDT 2009


Author: jedoig
Date: 2009-07-08 16:21:10 +0000 (Wed, 08 Jul 2009)
New Revision: 12886

Modified:
   ccwordpress/trunk/conf/creativecommons.conf
Log:
Preparing apache conf for switch to /choose

Modified: ccwordpress/trunk/conf/creativecommons.conf
===================================================================
--- ccwordpress/trunk/conf/creativecommons.conf	2009-07-08 16:08:08 UTC (rev 12885)
+++ ccwordpress/trunk/conf/creativecommons.conf	2009-07-08 16:21:10 UTC (rev 12886)
@@ -49,6 +49,11 @@
 RewriteCond %{HTTP_HOST} =www.creativecommons.org
 RewriteRule ^/(.*)$ http://%{SERVER_NAME}/$1 [L,R=301]
 
+# Redirect all /license to /choose before we go any deeper
+RewriteRule ^/license/(.*) /choose/$1
+RewriteRule ^/license$ /choose/
+RewriteRule ^/choose /choose/
+
 # Per mail from Mike, redirect both of these to /about/licenses
 RewriteRule /about/sampling-movie http://%{SERVER_NAME}/about/licenses/ [R=301,L]
 RewriteRule /about/licenses/sampling http://%{SERVER_NAME}/about/licenses/ [R=301,L]
@@ -177,9 +182,9 @@
 RewriteRule ^/store$ http://creativecommons.org/support/ [R]
 RewriteRule ^/donate$ http://creativecommons.org/support/ [R]
 RewriteRule ^/licesne(.*)$ http://creativecommons.org/license$1 [R]
-RewriteRule ^/license/devnations$ http://creativecommons.org/retiredlicenses [R]
-RewriteRule ^/license/cc-gpl-br$ http://creativecommons.org/license/cc-gpl [R]
-RewriteRule ^/license/cc-lgpl-br$ http://creativecommons.org/license/cc-lgpl [R]
+RewriteRule ^/choose/devnations$ http://creativecommons.org/retiredlicenses [R]
+RewriteRule ^/choose/cc-gpl-br$ http://creativecommons.org/choose/cc-gpl [R]
+RewriteRule ^/choose/cc-lgpl-br$ http://creativecommons.org/choose/cc-lgpl [R]
 RewriteRule ^/licenses/publicdomain/1.0(.*)$ http://creativecommons.org/licenses/publicdomain/ [R]
 RewriteRule ^/projects/international(.*)$ http://creativecommons.org/worldwide$1 [R]
 RewriteRule ^/worldwide/(..)$ http://creativecommons.org/worldwide/$1/ [R]
@@ -213,7 +218,7 @@
 RewriteRule ^/icon/(.*)$ http://creativecommons.org/icons/$1 [R]
 RewriteRule ^/licenses/(.*)/2.0/ar/(.*)$ http://creativecommons.org/licenses/$1/2.5/ar/$2 [R]
 RewriteRule ^/contest/(.*)$ http://creativecommons.org/video/movingimagecontest [R]
-RewriteRule ^/license/meet-the-licenses$ http://creativecommons.org/about/licenses/meet-the-licenses [R]
+RewriteRule ^/choose/meet-the-licenses$ http://creativecommons.org/about/licenses/meet-the-licenses [R]
 RewriteRule ^/licenses/meet-the-licenses$ http://creativecommons.org/about/licenses/meet-the-licenses [R]
 RewriteRule ^/licenses/(.*)([0-9])$ http://creativecommons.org/licenses/$1$2/ [R]
 RewriteRule ^/licenses/(.*)/([0-9]\.[0-9])/([a-z][a-z])$ http://creativecommons.org/licenses/$1/$2/$3/ [R]
@@ -258,7 +263,7 @@
 RewriteRule ^/projects/(.+) http://wiki.creativecommons.org/$1 [R,NE,L]
 
 # Added by nkinkade 2007-09-28 per email from Mike.
-RewriteRule ^/license/publicdomain/?$ http://creativecommons.org/license/publicdomain-2/ [L,R]
+RewriteRule ^/choose/publicdomain/?$ http://creativecommons.org/choose/publicdomain-2/ [L,R]
 
 RewriteRule ^/video/([-a-z0-9]+)/?$ /index.php?category_name=video&name=$1 [QSA,L]
 RewriteRule ^/audio/([-a-z0-9]+)/?$ /index.php?category_name=audio&name=$1 [QSA,L]
@@ -267,10 +272,8 @@
 RewriteRule ^/education/([-a-z0-9]+)/?$ /index.php?category_name=education&name=$1 [QSA,L]
 RewriteRule ^/commoners/([-a-z0-9]+)/?$ /index.php?category_name=commoners&name=$1 [QSA,L]
 
-RewriteRule ^/license/pngie.htc$ /includes/pngie.htc [L]
+RewriteRule ^/choose/pngie.htc$ /includes/pngie.htc [L]
 
-RewriteRule ^/license$ http://creativecommons.org/license/ [L,R]
-
 RewriteRule ^/(license|licenses)/@@/cc/cc3/(.*)$ /wp-content/themes/cc3/$2 [L]
 RewriteRule ^/(license|licenses)/@@/cc/cc4/(.*)$ /wp-content/themes/cc4/$2 [L]
 RewriteRule ^/(license|licenses)/@@/cc/(.*)$ /$2 [L]




More information about the cc-commits mailing list