From 07e7a44ddb25fd0697e64fe670b8e1ca96b8b216 Mon Sep 17 00:00:00 2001 From: Tim Mansfield Date: Sat, 24 Aug 2013 04:31:02 -0700 Subject: [PATCH] Clarify install doc wrt how to create databases --- docs/DEVELOPER-ADVANCED.md | 13 +++++++------ docs/DEVELOPMENT-OSX-NATIVE.md | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/DEVELOPER-ADVANCED.md b/docs/DEVELOPER-ADVANCED.md index 8c073836a..55719e42d 100644 --- a/docs/DEVELOPER-ADVANCED.md +++ b/docs/DEVELOPER-ADVANCED.md @@ -1,17 +1,18 @@ # Discourse Advanced Developer Install Guide -This guide is aimed at advanced Rails developers who have installed their own Rails apps before. If you are new -to rails, you are likely much better off with our **[Discourse Vagrant Developer Guide](VAGRANT.md)**. +This guide is aimed at advanced Rails developers who have installed their own Rails apps before. If you are new to Rails, you are likely much better off with our **[Discourse Vagrant Developer Guide](VAGRANT.md)**. + +Note: If you are developing on a Mac, you will probably want to look at [these instructions](DEVELOPMENT-OSX-NATIVE.md) as well. ## First Steps 1. Install and configure PostgreSQL 9.1+. Make sure that the server's messages language is English; this is [required](https://github.com/rails/rails/blob/3006c59bc7a50c925f6b744447f1d94533a64241/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb#L1140) by the ActiveRecord Postgres adapter. -2. Install and configure Redis 2+ +2. Install and configure Redis 2+. 3. Install libxml2, g++, and make. 4. Install Ruby 1.9.3 and Bundler. 5. Clone the project and bundle. -6. Create development and test databases in postgres. -7. Copy `config/database.yml.development-sample` and `config/redis.yml.sample` to `config/database.yml` and `config/redis.yml` and input the correct values to point to your postgres and redis instances. +6. Copy `config/database.yml.development-sample` to `config/database.yml`. Copy `config/redis.yml.sample` to `config/redis.yml`. Edit the files to point to your postgres and redis instances. +7. Create the "vagrant" user and the development and test databases in postgres. See the postgres section in "Building your own Vagrant VM", below. 8. Install the seed data to set up an admin account and meta topic: `psql DATABASE_NAME < pg_dumps/production-image.sql` @@ -24,7 +25,7 @@ to rails, you are likely much better off with our **[Discourse Vagrant Developer 5. Try running the specs: `bundle exec rake autospec` 6. `bundle exec rails server` -You should now be able to connect to rails on http://localhost:3000 - try it out! The seed data includes a pinned topic that explains how to get an admin account, so start there! Happy hacking! +You should now be able to connect to rails on [http://localhost:3000](http://localhost:3000) - try it out! The seed data includes a pinned topic that explains how to get an admin account, so start there! Happy hacking! # Building your own Vagrant VM diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md index c2ef50e34..962ca4be2 100644 --- a/docs/DEVELOPMENT-OSX-NATIVE.md +++ b/docs/DEVELOPMENT-OSX-NATIVE.md @@ -92,7 +92,7 @@ Atlassan has a free GIT client for OS X called [SourceTree](http://www.sourcetre OS X ships with Postgres 9.1.5, but you're better off going with the latest from Homebrew or [Postgres.App](http://postgresapp.com). -### Using Postgress.app +### Using Postgres.app [Instructions pending]