Merge pull request #41 from creativecommons/chooser-redirect

updated apache config to redirect chooser and remove about cc licenses rewrites

Author: TimidRobot

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

@@ -61,18 +61,20 @@ ServerName localhost:8080
 
     ###########################################################################
     # Chooser
-    Alias /choose /var/www/git/chooser/docs
-    <Directory /var/www/git/chooser/docs>
-        # Disable .htaccess (for security and performance)
-        AllowOverride None
-        # Redirect .../index.php to .../
-        RewriteCond %{REQUEST_FILENAME} "index\.php$" [NC]
-        RewriteCond %{REQUEST_FILENAME} !-f
-        RewriteRule (.*/)index\.php$ $1 [L,NC,R=301]
-        # Deny access to PHP files (content should be only static files)
-        RewriteRule .*\.php "-" [F,L]
-    </Directory>
-    RedirectPermanent /chooser /choose
+#    Alias /choose /var/www/git/chooser/docs
+#    <Directory /var/www/git/chooser/docs>
+#        # Disable .htaccess (for security and performance)
+#        AllowOverride None
+#        # Redirect .../index.php to .../
+#        RewriteCond %{REQUEST_FILENAME} "index\.php$" [NC]
+#        RewriteCond %{REQUEST_FILENAME} !-f
+#        RewriteRule (.*/)index\.php$ $1 [L,NC,R=301]
+#        # Deny access to PHP files (content should be only static files)
+#        RewriteRule .*\.php "-" [F,L]
+#    </Directory>
+    RedirectPermanent /choose/zero  /choose
+    RedirectPermanent /chooser      /choose
+    RedirectTemp /choose https://chooser-beta.creativecommons.org
 
     ###########################################################################
     # FAQ
@@ -104,8 +106,6 @@ ServerName localhost:8080
 
     ###########################################################################
     # WordPress/Default
-    RewriteRule ^/licenses/$        /about/cclicenses/
-    RewriteRule ^/publicdomain/$    /about/cclicenses/
     DocumentRoot /var/www/html
     <Directory /var/www/html>
         # Expected configuration for WordPress