Skip to content

Commit f40922b

Browse files
committedJun 11, 2014
Updated some configuration values to remove unneeded settings as well as avoid collision
1 parent 8e4fb61 commit f40922b

File tree

4 files changed

+17
-37
lines changed

4 files changed

+17
-37
lines changed
 

‎.ruby-gemset

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
coderwall-web
1+
coderwall

‎Vagrantfile

+8-15
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
1919

2020
config.vm.network :private_network, ip: '192.168.237.95' # 192.168.cdr.wl
2121

22-
{
23-
'Postgres' => 5432,
24-
'Redis' => 6379,
25-
'ElasticSearch' => 9200,
26-
'MongoDB' => 27017
27-
}.each do |service, port|
28-
puts "Opening port #{port} to allow access to #{service} on guest"
29-
config.vm.network :forwarded_port, guest: port, host: port, auto_correct: true
30-
end
31-
# Rails (default)
32-
config.vm.network :forwarded_port, guest: 3000, host: 3001, auto_correct: true
33-
# Rails (foreman)
34-
config.vm.network :forwarded_port, guest: 5000, host: 5001, auto_correct: true
35-
# Rails (puma)
36-
config.vm.network :forwarded_port, guest: 9292, host: 9293, auto_correct: true
22+
# Postgres
23+
config.vm.network :forwarded_port, guest: 5432, host: 2200
24+
# Redis
25+
config.vm.network :forwarded_port, guest: 6379, host: 2201
26+
# ElasticSearch
27+
config.vm.network :forwarded_port, guest: 9200, host: 9200
28+
# MongoDB
29+
config.vm.network :forwarded_port, guest: 27017, host: 27017
3730

3831
config.vm.synced_folder '.', '/home/vagrant/web', nfs: true
3932

‎config/database.yml

+7-20
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,16 @@
1-
development:
2-
database: coderwall_development
1+
default: &default
32
adapter: postgresql
43
encoding: unicode
54
host: localhost
65
password:
76
pool: 5
8-
port: 5432
7+
port: <%= ENV['DEV_POSTGRES_PORT'] || 5432 %>
98
username: vagrant
109

10+
development:
11+
<<: *default
12+
database: coderwall_development
13+
1114
test:
12-
adapter: postgresql
15+
<<: *default
1316
database: coderwall_test
14-
encoding: unicode
15-
host: localhost
16-
password:
17-
pool: 5
18-
port: 5432
19-
username: vagrant
20-
21-
production:
22-
adapter: postgresql
23-
database: coderwall_production
24-
encoding: unicode
25-
host: localhost
26-
password:
27-
pool: 5
28-
port: 5432
29-
username: vagrant

‎vagrant/user-config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ _RUBY_VERSION=ruby-2.1.0
1818
rvm install $_RUBY_VERSION
1919
rvm gemset create coderwall
2020
rvm use $_RUBY_VERSION --default
21-
rvm use $_RUBY_VERSION@coderwall-web
21+
rvm use $_RUBY_VERSION@coderwall
2222
cd $HOME/web
2323
gem update --system && gem update bundler
2424
bundle config --global jobs 3

0 commit comments

Comments
 (0)
Please sign in to comment.