remove some apache options we shouldn't need; move one into README as a deployment note

Author: vthunder

README.md

@@ -7,16 +7,25 @@ as needed:
 
     <VirtualHost *:8080>
         Use CCVHost creativecommons.org http /var/www/creativecommons.org /var/log/apache2/creativecommons.org
+	UseCanonicalName On
     </VirtualHost>
 
     <VirtualHost *:443>
         Use CCVHost creativecommons.org https /var/www/creativecommons.org /var/log/apache2/creativecommons.org
+	UseCanonicalName On
         SSLEngine on
         SSLCertificateFile /etc/ssl/private/creativecommons.org.crt
         SSLCertificateKeyFile /etc/ssl/private/creativecommons.org.key
         SSLCACertificateFile /etc/ssl/certs/RapidSSL_CA_bundle.pem
     </VirtualHost>
 
+The <code>UseCanonicalName</code> option forces URLs to redirect to
+the canonical host name, you can remove it if you want to use other
+names to access the site (e.g., an Amazon EC2 hostname before you get
+DNS set-up).
+
+
+
 You'll need the <code>macro</code> Apache module. On Debian-like systems you can try:
 
     apt-get install libapache2-mod-macro

apache.conf

@@ -17,8 +17,6 @@
 
     Options +ExecCGI
 
-    SuexecUserGroup webadmin webadmin
-
     <Location /licenses>
         DirectoryIndex deed
         DefaultType text/html
@@ -46,21 +44,6 @@
         ForceType text/html
     </LocationMatch>
 
-    # We only want relative URLs to point to creativecommons.org and nothing else
-    # like www.CC.org, etc.
-    UseCanonicalName On
-    
-    # Let's have Apache set some caching options for most images on CC.org
-    <Directory ${dir}/docroot/wp-content/uploads>
-        ExpiresActive On
-        ExpiresDefault A60480800
-    </Directory>
-
-    <Directory ${dir}/docroot/images>
-        ExpiresActive On
-        ExpiresDefault A60480800
-    </Directory>
-    
     DirectoryIndex index.php index.html
 
     ### ------------------------- ####