summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2015-06-22 20:09:13 -0600
committermo khan <mo@mokhan.ca>2015-06-22 20:09:13 -0600
commitde56e683beeff28d0da53d910e5831ca4e3dd743 (patch)
tree766b437fa5402a5c33a86be38367d113e3a0eb42
parent98dae64cdd50e7884028fe16dbf7920cb5c6e673 (diff)
update vagrant bootstrap to copy the .env.example to .env.local instead of symlinking it.
-rw-r--r--.gitignore2
-rwxr-xr-xbin/bootstrap-vagrant-user.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 2fcf29b..0444500 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@
!/log/.keep
/tmp
.vagrant
-.env
+.env*
database.yml
vendor/bundle
coverage
diff --git a/bin/bootstrap-vagrant-user.sh b/bin/bootstrap-vagrant-user.sh
index 2fd391a..b10632a 100755
--- a/bin/bootstrap-vagrant-user.sh
+++ b/bin/bootstrap-vagrant-user.sh
@@ -14,8 +14,8 @@ rbenv global 2.2.2
gem install bundler --no-ri --no-rdoc
cd /vagrant
createdb
-if [ ! -f .env ]; then
- ln -s .env.example .env
+if [ ! -f .env.local ]; then
+ cp .env.example .env.local
fi
bin/setup
RAILS_ENV=test bundle exec rake db:create db:migrate db:seed