Merge pull request #3 from reactivepixel/master

Unify Trusty64 (resolves issue #2)

Author: jbinto

README.md

@@ -40,6 +40,8 @@ I'm currently retrieving Ansible from git, as well as the `dopy` module for Digi
 ```
 git clone https://github.com/jbinto/ansible-ubuntu-rails-server.git
 cd ansible-ubuntu-rails-server
+brew install python
+sudo easy_install pip
 sudo pip install -r requirements.txt
 ```
 
@@ -81,7 +83,7 @@ gem install tugboat
 tugboat authorize
 ```
 
-Edit `./vars/digitalocean.yml`. 
+Edit `./vars/digitalocean.yml`.
 
 * Note that `hostname` must be a real FQDN you own, and the DNS must be pointing to DigitalOcean.
 * You can use `tugboat` to acquire the magic numbers needed for region/image/size IDs.
@@ -142,7 +144,7 @@ Note that after the first run, `root` will no longer be able to log in. To run t
 # clang: error: unknown argument: '-mno-fused-madd' [-Wunused-command-line-argument-hard-error-in-future]
 ```
 
-Run: 
+Run:
 
 ```
 echo "ARCHFLAGS=-Wno-error=unused-command-line-argument-hard-error-in-future" >> ~/.zshrc

Vagrantfile

@@ -4,10 +4,10 @@
 VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  
+
   config.vm.define :web do |web|
-    web.vm.box = "precise64"
-    web.vm.box_url = "http://files.vagrantup.com/precise64.box"
+    web.vm.box = "trusty64"
+    web.vm.box_url = "http://files.vagrantup.com/trusty64.box"
     web.vm.network :private_network, ip: "10.33.33.33"
     web.vm.network :forwarded_port, guest: 80, host: 8080
 

roles/postgresql/tasks/main.yml

@@ -38,10 +38,10 @@
     - python-psycopg2
 
 - name: Copy valid pg_hba.conf
-  template: src=pg_hba.conf.j2 dest=/etc/postgresql/9.3/main/pg_hba.conf
+  template: src=pg_hba.conf.j2 dest=/etc/postgresql/9.4/main/pg_hba.conf
   sudo: yes
 
 - name: Restart PostgreSQL
   # NOTE: If conf files were updated here, need to FORCE a RESTART!
   service: name=postgresql state=started
-  sudo: yes
+  sudo: yes