Author: jfthomps
Date: Tue Mar  8 20:56:01 2011
New Revision: 1079536

URL: http://svn.apache.org/viewvc?rev=1079536&view=rev
Log:
VCL-434

updated web code instructions and noted any sections that are 2.1 to 2.2.1 only

Modified:
    incubator/vcl/trunk/UPGRADE

Modified: incubator/vcl/trunk/UPGRADE
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/UPGRADE?rev=1079536&r1=1079535&r2=1079536&view=diff
==============================================================================
--- incubator/vcl/trunk/UPGRADE (original)
+++ incubator/vcl/trunk/UPGRADE Tue Mar  8 20:56:01 2011
@@ -50,19 +50,19 @@ code at /var/www/html/vcl. If you instal
           cd /root/apache-VCL-2.2.1-incubating
                cp -r web /var/www/html/vcl
 
-       c. copy your 2.1 config files
+       c. copy your config files from the previous version:
 
           cd ~/vcl-pre2.2.1_web/.ht-inc
                cp conf.php secrets.php pubkey.pem keys.pem 
/var/www/html/vcl/.ht-inc
 
-       d. make /var/www/html/vcl/.ht-inc/maintenance writable by the web 
server - if
-          httpd on your server is running as the user apache:
+       d. (2.1 -> 2.2.1 only) make /var/www/html/vcl/.ht-inc/maintenance 
writable by
+               the web server - if httpd on your server is running as the user 
apache:
 
           chown apache /var/www/html/vcl/.ht-inc/maintenance
 
-       e. add the following new entries to conf.php - You can copy them in from
-          .ht-inc/conf-default.php. Descriptions of each item can also be found
-               in conf-default.php
+       e. (2.1 -> 2.2.1 only) add the following new entries to conf.php - You 
can copy
+               them in from .ht-inc/conf-default.php. Descriptions of each 
item can also be
+               found in conf-default.php
 
           * date_default_timezone_set('America/New_York');
                * $blockNotifyUsers = "adminu...@example.org";
@@ -92,7 +92,7 @@ copy in the new management node code.
 
                /bin/cp -r /root/apache-VCL-2.2.1-incubating/managementnode/* 
/usr/local/vcl
 
-       c. Make changes related to vcld.conf settings
+       c. (2.1 -> 2.2.1 only) Make changes related to vcld.conf settings
 
           * Open VCL web interface
                * Go to Management Nodes


Reply via email to