[cc-commits] [CC SVN] r15198 - apache_vhost_configs/trunk
webmaster at creativecommons.org
webmaster at creativecommons.org
Sun Sep 4 10:34:36 EDT 2011
Author: nkinkade
Date: 2011-09-04 14:34:34 +0000 (Sun, 04 Sep 2011)
New Revision: 15198
Modified:
apache_vhost_configs/trunk/staging.creativecommons.org.conf
Log:
Sampling+ rules must come before others else others will match and incorrectly rewrite.
Modified: apache_vhost_configs/trunk/staging.creativecommons.org.conf
===================================================================
--- apache_vhost_configs/trunk/staging.creativecommons.org.conf 2011-09-02 16:20:42 UTC (rev 15197)
+++ apache_vhost_configs/trunk/staging.creativecommons.org.conf 2011-09-04 14:34:34 UTC (rev 15198)
@@ -99,6 +99,9 @@
# License engine and legalcode
#----------
+Alias /ccengine-fcgi /var/www/staging.creativecommons.org/cc.engine_env/ccengine.fcgi
+Alias /cc.engine-cache /var/www/staging.creativecommons.org/cc.engine_env/cache
+
# Redirect all /license to /choose before we go any deeper
RewriteRule ^/choose$ %{ENV:reqproto}://%{SERVER_NAME}/choose/ [L,R=301]
RewriteRule ^/license$ %{ENV:reqproto}://%{SERVER_NAME}/choose/ [L,R=301]
@@ -106,13 +109,13 @@
# Legalcode rewrites
RewriteRule ^/legalcode %{ENV:reqproto}://%{SERVER_NAME}/ [L,R=301]
RewriteRule .*legalcode/$ %{ENV:reqproto}://%{SERVER_NAME}/ [L,R=301]
+RewriteRule ^/licenses/(.*)sampling\+/1.0/(.*)/legalcode$ /legalcode/$1samplingplus_1.0_$2.html [L]
+RewriteRule ^/licenses/(.*)sampling\+/1.0/legalcode$ /legalcode/$1samplingplus_1.0.html [L]
RewriteRule ^/licenses/(.*)/([0-9]\.[0-9])/(.*)/legalcode\.([A-Za-z-]+)$ /legalcode/$1_$2_$3_$4.html [L]
RewriteRule ^/licenses/(.*)/([0-9]\.[0-9])/legalcode\.([a-z][a-z])$ /legalcode/$1_$2_$3.html [L]
RewriteRule ^/licenses/(.*)/([0-9]\.[0-9])/(.*)/legalcode$ /legalcode/$1_$2_$3.html [L]
RewriteRule ^/licenses/(.*)/([0-9]\.[0-9])/legalcode$ /legalcode/$1_$2.html [L]
RewriteRule ^/licenses/(.*)/([0-9]\.[0-9])/legalcode\.txt$ /legalcode/$1_$2.txt [L]
-RewriteRule ^/licenses/(.*)sampling\+/1.0/(.*)/legalcode$ /legalcode/$1samplingplus_1.0_$2.html [L]
-RewriteRule ^/licenses/(.*)sampling\+/1.0/legalcode$ /legalcode/$1samplingplus_1.0.html [L]
RewriteRule ^/publicdomain/(.*)/([0-9]\.[0-9])/legalcode$ /legalcode/$1_$2.html [L]
RewriteRule ^/publicdomain/(.*)/([0-9]\.[0-9])/legalcode\.txt$ /legalcode/$1_$2.txt [L]
@@ -126,9 +129,6 @@
RewriteRule ^/(publicdomain|licenses)/(.*)/([0-9]\.[0-9])/rdf$ /license_rdf/creativecommons.org_$1_$2_$3_.rdf [L,T=application/rdf+xml]
RewriteRule .*rdf/$ %{ENV:reqproto}://%{SERVER_NAME}/ [L,R=301]
-Alias /ccengine-fcgi /var/www/staging.creativecommons.org/cc.engine_env/ccengine.fcgi
-Alias /cc.engine-cache /var/www/staging.creativecommons.org/cc.engine_env/cache
-
# See if deed is cached before sending to cc.engine
RewriteCond %{REQUEST_URI} ^/licenses
RewriteCond /var/www/%{SERVER_NAME}/cc.engine_env/cache/%{REQUEST_FILENAME} -s
More information about the cc-commits
mailing list