diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-04-17 12:55:29 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-04-17 12:55:29 +0100 |
| commit | f5b4308b0bd68577e5c85fdbdab1d22876f6c1d4 (patch) | |
| tree | eaac4aa12e7cfe896c92ea31e3c099e66e85140e | |
| parent | ee0eb23bd793a7ac811cb6a0b816e60693af77c9 (diff) | |
| parent | 9b5837c399e0525fac34470cf824c4efafd1ff58 (diff) | |
Merge branch 'vagrant_debian' of github.com:sebbacon/alaveteli into vagrant_debianvagrant_debian
Conflicts:
doc/INSTALL-vagrant.md
| -rw-r--r-- | doc/INSTALL-vagrant.md | 4 | ||||
| -rw-r--r-- | doc/INSTALL.md | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/doc/INSTALL-vagrant.md b/doc/INSTALL-vagrant.md index 1e3f98396..34a8ae30e 100644 --- a/doc/INSTALL-vagrant.md +++ b/doc/INSTALL-vagrant.md @@ -40,7 +40,7 @@ shared folders. ### Load sample data and index it - ./script/load-sample-data && ./script/rebuild-xapian-index + bundle exec ./script/load-sample-data && bundle exec ./script/rebuild-xapian-index ### Run the tests @@ -48,7 +48,7 @@ shared folders. ### Start the development server - ./script/server + bundle exec ./script/server ### And you're golden diff --git a/doc/INSTALL.md b/doc/INSTALL.md index b12eb20f3..5cbad765c 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -227,7 +227,7 @@ according to the Troubleshooting guide at the end of this document. In the 'alaveteli' directory, run: - ./script/rails-post-deploy + bundle exec ./script/rails-post-deploy (This will need execute privs so `chmod 755` if necessary.) This sets up directory structures, creates logs, installs/updates themes, runs @@ -248,11 +248,11 @@ If you want some dummy data to play with, you can try loading the fixtures that the test suite uses into your development database. You can do this with: - ./script/load-sample-data + bundle exec ./script/load-sample-data Next we need to create the index for the search engine (Xapian): - ./script/rebuild-xapian-index + bundle exec ./script/rebuild-xapian-index If this fails, the site should still mostly run, but it's a core component so you should really try to get this working. @@ -273,7 +273,7 @@ gone wrong. Run the following to get the server running: - ./script/server --environment=development + bundle exec ./script/server --environment=development By default the server listens on all interfaces. You can restrict it to the localhost interface by adding ` --binding=127.0.0.1` |