Updated the Vagrant configuration to use a direct HTTPS url from S3. Also touched up the configuration in the bootstrap to ensure that Postgres is actually being restarted and picking up custom configuration

just3ws · just3ws · commit 163ba382508d · 2014-06-25T03:27:50.000-05:00
diff --git a/Vagrantfile b/Vagrantfile
@@ -4,7 +4,9 @@
 VAGRANTFILE_API_VERSION = "2"
 
 $box = 'coderwall'
-$box_url = 'http://cdn.coderwall.com/vagrant/coderwall.box'
+# The box is 1GB. Prepare yourself.
+#$box_url = 'http://cdn.coderwall.com/vagrant/coderwall.box'
+$box_url = 'https://s3.amazonaws.com/coderwall-assets-0/vagrant/coderwall.box'
 $provision = 'vagrant/bootstrap.sh'
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
diff --git a/config/database.yml b/config/database.yml
@@ -1,16 +1,26 @@
-default: &default
+development:
   adapter: postgresql
+  database: coderwall_development
   encoding: unicode
   host: localhost
-  password:
   pool: 5
-  port: <%= ENV['DEV_POSTGRES_PORT'] || 5432 %>
+  port: 5432
   username: vagrant
 
-development:
-  <<: *default
-  database: coderwall_development
-
 test:
-  <<: *default
+  adapter: postgresql
   database: coderwall_test
+  encoding: unicode
+  host: localhost
+  pool: 5
+  port: 5432
+  username: vagrant
+
+production:
+  adapter: postgresql
+  database: coderwall_production
+  encoding: unicode
+  host: localhost
+  pool: 5
+  port: 5432
+  username: vagrant
diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh
@@ -8,5 +8,6 @@ echo export EDITOR=vim >> $HOME/.bashrc
 # Enable accessing Postgres from the host machin
 echo "listen_addresses = '*'" | tee -a /var/pgsql/data/postgresql.conf
 echo host all all  0.0.0.0/0 trust | tee -a  /var/pgsql/data/pg_hba.conf
+sudo su postgres -c 'pg_ctl stop -D /var/pgsql/data  2>&1'
 sudo su postgres -c 'pg_ctl restart -D /var/pgsql/data  2>&1 &'
 su -c "source /home/vagrant/web/vagrant/user-config.sh" vagrant
diff --git a/vagrant/user-config.sh b/vagrant/user-config.sh
@@ -27,6 +27,9 @@ bundle install
 # Setup .env
 cp .env.example .env -n
 
-foreman run rake db:create:all
-foreman run rake db:setup
-foreman run rake db:test:prepare
+sudo su postgres -c 'pg_ctl stop -D /var/pgsql/data  2>&1'
+sudo su postgres -c 'pg_ctl restart -D /var/pgsql/data  2>&1 &'
+
+rake db:create:all
+rake db:test:prepare
+rake db:setup
