Skip to content

Commit

Permalink
Update instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
lkysow committed Sep 25, 2011
1 parent c9125ad commit dbe1a6e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
13 changes: 8 additions & 5 deletions InstallationGnuLinux.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ following methods :

$> su # and then enter your root password
#> aptitude install ruby-full build-essential rubygems rake libsvn-ruby
subversion
subversion #make sure ruby-full points to the correct ruby version (1.8)

(as normal user, with the "sudo" method)::

$> sudo aptitude install ruby-full build-essential rubygems rake libsvn-ruby
subversion # and then enter your root password
subversion # and then enter your root password, make sure ruby-full points to the correct ruby version (1.8)

**Note : You can either use PostgreSQL or MySQL or SQLite3 as database**

Expand Down Expand Up @@ -218,7 +218,7 @@ Read through all settings in environment.rb

Look at config/environments/development.rb

* Change the REPOSITORY_STORAGE path to an appropriate path for your setup.
* Change the REPOSITORY_STORAGE path to an appropriate path for your setup. NOTE: it is unlikely that you need to change these values for development

Test plain MarkUs installation
--------------------------------------------------------------------------------
Expand All @@ -233,21 +233,24 @@ command)::

# gets gems that you do not have yet, like thoughtbot-shoulda
#> bundle install --without (postgresql) (sqlite) (mysql)
#> bundle exec rake db:create # creates development database
#> bundle exec rake db:create:all # creates all the databases uncommented in config/database.yml
#> bundle exec rake db:schema:load # loads required relations into database
#> bundle exec rake db:populate # populates database with some data
#> bundle exec rake db:test:prepare
#> bundle exec rake test:units
#> bundle exec rake test:functionals

Note: there are still tests that are failing.
Note: if you are using RVM, follow [[these instuctions|RVM]] to install subversion into the correct path

Now, you are ready to test your plain MarkUs installation. The most straight
forward way to do this is to start the mongrel server on the command-line. You
can do so by::

bundle exec script/server #boots up mongrel (or WebRink, if mongrel is not installed/found)

If this doesn't work try::
rails s

**Common Problems**

If some of the previous commands fail with error message similar to
Expand Down
4 changes: 3 additions & 1 deletion SettingUpMySQL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ To create a database user, enter the following commands: (In this example, the
user is named 'markus', his password is 'markus', and he will be given
superuser privileges. This user will be used for MarkUs later on.)::

#>mysql --user=root mysql
#>mysql --user=root --password=<my password> mysql
#>CREATE USER 'markus'@'localhost' IDENTIFIED BY 'markus';
#>GRANT ALL PRIVILEGES ON *.* TO 'markus'@'localhost' WITH GRANT OPTION;

Expand All @@ -60,6 +60,8 @@ Setup the database.yml file, in the MarkUs' root directory:

* change the usernames and password to the ones you used in the section above

* uncomment the development and test sections of config/database.yml

Now go back to the MarkUs tutorial :

* Installation on GNU/Linux
Expand Down

0 comments on commit dbe1a6e

Please sign in to comment.