X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=docs%2FINSTALL;h=05fea7c13983f0273616336d634a9bd4a584f88b;hb=4a039197705f92ee1c362401a7f7bb834ecc9079;hp=cba69d55d664d532a13245224d8cba1ab824f25e;hpb=83964878e92ce0687d47409b5832e7220e57d79f;p=patchwork

diff --git a/docs/INSTALL b/docs/INSTALL
index cba69d5..05fea7c 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -29,16 +29,21 @@ in brackets):
     user that your mail server runs as). On Ubuntu these are
     www-data and nobody, respectively.
 
-      PostgreSQL:
-        createdb patchwork
-        createuser www-data
-        createuser nobody
+    For PostgreSQL
 
-      MySQL:
+        $ createdb patchwork
+        $ createuser www-data
+        $ createuser nobody
+
+	- postgres uses the standard UNIX authentication, so these users
+	  will only be accessible for processes running as the same username.
+	  This means that no passwords need to be set.
+
+     For MySQL:
         $ mysql
 	> CREATE DATABASE 'patchwork';
-        > INSERT INTO user (Host, User) VALUES ('localhost', 'www-data');
-        > INSERT INTO user (Host, User) VALUES ('localhost', 'nobody');
+        > CREATE USER 'www-data'@'localhost' IDENTIFIED BY '<password>';
+        > CREATE USER 'nobody'@'localhost' IDENTIFIED BY '<password>';
 
 2. Django setup
 
@@ -62,17 +67,6 @@ in brackets):
          cd ../../apps
          ln -s ../lib/packages/django-registration ./registration
 
-	(OPTIONAL) If you want to enable the Patchwork XML-RPC interface,
-        which is required for pwclient to work, you'll need to set up the
-        django_xmlrpc package:
-
-         cd lib/packages/
-         wget \
-             http://django-xmlrpc.googlecode.com/files/django_xmlrpc-0.1.tar.gz
-         tar -zxf django_xmlrpc-0.1.tar.gz
-         cd ../../apps
-         ln -s ../lib/packages/django_xmlrpc ./django_xmlrpc
-
 	The settings.py file contains default settings for patchwork, you'll
 	need to configure settings for your own setup.
 
@@ -110,8 +104,10 @@ in brackets):
 	And add privileges for your mail and web users:
 
 	Postgresql:
-	  psql -f lib/sql/grant-all.sql patchwork
+	  psql -f lib/sql/grant-all.postgres.sql patchwork
 
+	MySQL:
+	  mysql patchwork < lib/sql/grant-all.mysql.sql
 
 
 3. Apache setup