r1744 + updated install/upgrade info

[racktables] / README

diff --git a/README b/README
index 77049e1c0182da2cadc7e79ae800ea9a098077fc..54d1dd74ff26dab75bd170592897c5c78881737a 100644 (file)
--- a/README
+++ b/README
@@ -26,24 +26,35 @@ For web-frontend you must have Apache and PHP 5 with PDO extension:
 Fedora Core 6: # yum install httpd php php-mysql php-pdo php-gd
 Fedora 8: yum install httpd php php-mysql php-pdo php-gd php-snmp
 
-II. Layout
+
+II. Prepare the server.
 1. Unpack the tarball and make it web-accessible, e.g. http://yourcompany.com/racktables
 or http://racktables.mysite.org.
-2. Edit install/init-auth.sql and change admin password
+2. mysql> create database_name; grant all privileges on database_name.* to XXX@YYY identified by 'ZZZ';
+
+
+There are two mutually exclusive ways to install RackTables, they are described as III-A and III-B.
+
+
+III-A. HTTP installation (starting with 0.14.12 release)
+Open your RackTables URL and follow the instructions. In a suitable
+environment everything should take a minute or so.
+
 
-III. Database setup
-mysql> create database_name;
+III-B. Manual installation.
+1. Edit install/init-auth.sql and change admin password
+
+2. Init database.
 mysql> use database_name;
 mysql> source install/init-structure.sql
 mysql> source install/init-auth.sql
 $ rm -f install/init-auth.sql
 mysql> source install/init-dictbase.sql
 mysql> source install/init-dictvendors.sql
-mysql> grant all privileges on database_name.* to XXX@YYY identified by 'ZZZ';
 
-Make sure your inc/secret.php matches real values you used in the above request.
+3. Edit inc/secret.php
 
-IV. $ rm -f install/init-auth.sql
+4. $ rm -f install/init-auth.sql
 (Just to be sure you did.)
 
 *******************************************************
@@ -63,6 +74,12 @@ procedure should be sufficient:
 4. Follow instructions. Normally, everything should be Ok. If it
    is not so, write down the failed quieries for further investigation.
 
+*******************************************************
+*                                                     *
+*                   RELEASE NOTES                     *
+*                                                     *
+*******************************************************
+
 Upgrading to 0.14.12
 The upgrade may show a failed query "alter database character set utf8", in
 this case the user should issue the query manually from the mysql command