Mark user as active when issuing a new password - this allows users who

[rails.git] / db / README

diff --git a/db/README b/db/README
index 1b50ccd9b9000e2bfa8d10ae1efe4a79fb4a5658..e3e210a43c440b4e90e7d188e92c7475bb7984c4 100644 (file)
--- a/db/README
+++ b/db/README
@@ -1,16 +1,32 @@
-you want to do something like this
+Creating database
+===================
+
+OSM server uses a database with the following name:
+
+openstreetmap
+
+You may create it with your preferable client or run next (linux) command:
+
+$ mysqladmin -u <uid> -p create openstreetmap
+
+(change <uid> with appropriate username of administrative user eg. root )
+
+Creating user, password, and access rights
+============================================
+
+$ mysql -u <uid> -p
+
+(change <uid> with appropriate username of administrative user eg. root )
 
-$ su
-# mysqladmin create openstreetmap
-# mysql
 > grant all privileges on openstreetmap.* to 'openstreetmap'@'localhost' identified by 'openstreetmap';
 > flush privileges;
 > exit
-# exit
-$ mysql openstreetmap -u openstreetmap -p < db/create_database.sql
 
-(the last line above gets you to what the server has right now)
+Creating database skeleton tables
+===================================
+
+Run this command from the root of your rails direcotry:
 
-$ mysql openstreetmap -u openstreetmap -p < db/migrate.sql
+$ rake db:migrate
 
-(this line gets you to where its going to be when we go live with rails)
+This will create the db for you