- updates from Morten. Thanks.

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@723 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/INSTALL b/INSTALL
index 5cf605e96b9a2f12bf09c25b35111f56dc8ec288..560cbdb1416d0a9c467d3c620012f18755794397 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -5,25 +5,26 @@ Method of installation.
 - Copy files/sample/sample.chan to files/blootbot.chan
 - Copy files/sample/sample.servers to files/blootbot.servers
 - Copy files/sample/sample.users to files/blootbot.users
+
 - Edit files/blootbot.config, modify to taste.
 - Edit files/blootbot.chan to set which channels to join.
 - Edit files/blootbot.servers to modify list of IRC servers to connect.
 
 - Install the following Perl modules:
-       - Net::IRC perl module
-               - Debian: (apt-get install libnet-irc-perl)
-       - WWW::Search
-               - Debian: (apt-get install libwww-search-perl)
-       - LWP
-               - Debian: (apt-get install libwww-perl)
-       - HTML::Parser
-               - Debian: (apt-get install libhtml-parser-perl)
+        - Net::IRC perl module
+            - Debian: (apt-get install libnet-irc-perl)
+        - WWW::Search
+            - Debian: (apt-get install libwww-search-perl)
+        - LWP
+            - Debian: (apt-get install libwww-perl)
+        - HTML::Parser
+            - Debian: (apt-get install libhtml-parser-perl)
 
 - Choose your database:
-       - MySQL, read INSTALL.mysql (supported)
-       - SQLite, read INSTALL.sqlite (supported)
-       - PgSQL, read INSTALL.pgsql (unsupported, may work)
-       - Berkeley DBM, read INSTALL.dbm (unsupported, may work)
+        - MySQL, read INSTALL.mysql (supported)
+        - SQLite, read INSTALL.sqlite (supported)
+        - PgSQL, read INSTALL.pgsql (unsupported, may work)
+        - Berkeley DBM, read INSTALL.dbm (unsupported, may work)
 
 - There are "bugs" in the perl modules.  Read INSTALL.patches on how to fix.
 

diff --git a/INSTALL.mysql b/INSTALL.mysql
index a1c6ebaa21a1ea33d505d94ec35ab2386996e610..6b367c19b7fa71841242ded1db47ede1a4d9fe96 100644 (file)
--- a/INSTALL.mysql
+++ b/INSTALL.mysql
@@ -2,24 +2,28 @@ INSTALL.mysql
 ----------------
 
 - Install a MySQL server and the DBI Perl modules.
-       - Debian: (apt-get install mysql-server libdbd-mysql-perl)
+    - Debian: (apt-get install mysql-server libdbd-mysql-perl)
+
+- Run 'mysqladmin -u root -p create <DB NAME>'
+    Where <DB NAME> is the same as specified in blootbot.config.
+
+- Run 'setup/setup.pl'
 
-- run 'mysqladmin -u root -p create <DB NAME>'
-- run 'setup/setup.pl'
 = Possible problems
-       - if connection to localhost is (short) refused, run
-               '/etc/init.d/mysql stop'.
-               '/etc/init.d/mysql start'.
-       - if connection for user is refused, reload grant tables with
-               'mysqladmin -u root -p reload'
+    - if connection to localhost is (short) refused, run
+            '/etc/init.d/mysql stop'
+            '/etc/init.d/mysql start'
+    - if connection for user is refused, reload grant tables with
+            'mysqladmin -u root -p reload'
+
 * [OPTIONAL]
-       - run 'scripts/dbm2mysql.pl old-db' to convert dbm database file
-         to mysql.
+    - run 'scripts/dbm2mysql.pl old-db' to convert dbm database file
+    to mysql.
 
 ADDITIONAL NOTES:
 -----------------
- You can add a new user manually by connecting to MySQL and performing these
- commands:
+You can add a new user manually by connecting to MySQL and performing these
+commands:
 
   $ mysql -u root -p
 
@@ -27,5 +31,9 @@ ADDITIONAL NOTES:
   mysql> GRANT USAGE ON *.* TO 'user'@'localhost' IDENTIFIED BY 'yourpassword';
   mysql> GRANT ALL PRIVILEGES ON blootbot.* TO 'user'@'localhost';
 
-for the mysql that are on apt the bot (#debian@OPN), they are available 
-at http://emu.res.cmu.edu/~apt/blootbot/apt.sql.bz2
+FULL FACTOID DATABASE:
+----------------------
+You can get the data from the MySQL database that the apt bot uses on
+#debian at freenode (irc.freenode.net), at:
+
+    http://emu.res.cmu.edu/~apt/blootbot/apt.sql.bz2

diff --git a/INSTALL.pgsql b/INSTALL.pgsql
index 3130dc8686990e5ccc0705ec77612e8d632c5257..1810d5f27315e86afba2737562ea69be4c01259c 100644 (file)
--- a/INSTALL.pgsql
+++ b/INSTALL.pgsql
@@ -4,4 +4,5 @@ Method of installation.
 - Debian: (apt-get install postgresql)
 - Debian: (apt-get install libpgperl)
 
-- run 'scripts/setup.pl'
+SUPPORT FOR PGSQL IS CURRENTLY BROKEN! You'll have to use one of the other
+databases instead.