reorganize/update cc-legal-tools apache config section

Author: TimidRobot

config/web-sites-available/000-default.conf

@@ -53,6 +53,12 @@ ServerName localhost:8080
     <Directory /var/www/git/cc-legal-tools-data/docs>
         # Disable .htaccess (for security and performance)
         AllowOverride None
+        # Enable CORS (cross-origin resource sharing)
+        Header set Access-Control-Allow-Origin "*"
+        # Correct mimetype for .../rdf files
+        RewriteRule (.*/rdf$) $1 [T=application/rdf+xml]
+        # Language redirects
+        Include /var/www/git/cc-legal-tools-data/config/language-redirects
         # Also serve HTML files without .html extension
         RewriteCond %{REQUEST_FILENAME}.html -f
         RewriteRule !.*\.html$ %{REQUEST_FILENAME}.html [L]
@@ -62,16 +68,19 @@ ServerName localhost:8080
         RewriteRule (.*/)index\.php$ $1 [L,NC,R=301]
         # Deny access to PHP files (content should be only static files)
         RewriteRule .*\.php$ "-" [F,L]
-        # Correct mimetype for .../rdf files
-        RewriteRule (.*/rdf$) $1 [T=application/rdf+xml]
-        # Enable CORS (cross-origin resource sharing)
-        Header set Access-Control-Allow-Origin "*"
     </Directory>
-    Include /var/www/git/cc-legal-tools-data/config/language-redirects
-    RedirectPermanent   /licenses/work-html-popup   /choose
-    RedirectPermanent   /licenses/publicdomain/     /publicdomain/
-    RedirectPermanent   /licenses/mark/1.0          /publicdomain/mark/1.0
-    RedirectPermanent   /licences                   /licenses
+    # Legacy/compatibilty redirects
+    RedirectPermanent   /licenses/work-html-popup       /choose
+    RedirectPermanent   /licences                       /licenses
+    # Redirect legacy public domain URLs
+    RedirectPermanent   /licenses/publicdomain/         /publicdomain/
+    RedirectPermanent   /licenses/mark/1.0              /publicdomain/mark/1.0
+    # Licenses 1.0 has reverse ordered components
+    RedirectPermanent   /licenses/nc-nd/1.0             /licenses/nd-nc/1.0
+    RedirectPermanent   /licenses/by-nc-nd/1.0          /licenses/by-nd-nc/1.0
+    # Licenses 2.1 only includes ports
+    RedirectMatch       /licenses/([^/]+)/2.1/(lega.*)  /licenses/$1/2.0/$2
+    RedirectMatch       /licenses/([^/]+)/2.1/(deed.*)  /licenses/$1/2.0/$2
 
     ###########################################################################
     # Chooser