Merge branch 'reedlaw-master'

Closes #52
smashingboxes · Feb 17, 2015 · 2f4fd50 · 2f4fd50
2 parents 0d42f3f + 90dccfd
commit 2f4fd50
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/ansible.cfg b/ansible.cfg
@@ -1,2 +1,2 @@
 [defaults]
-roles_path = ~/.vendor
+roles_path = ./vendor
diff --git a/roles/backend_install_essentials/meta/main.yml b/roles/backend_install_essentials/meta/main.yml
@@ -5,4 +5,4 @@ dependencies:
     rbenv_plugins:
       - name: ruby-build
         repo: git://github.com/sstephenson/ruby-build.git
-        version: v20141225
+        version: 2.2.0
diff --git a/roles/backend_install_essentials/tasks/main.yml b/roles/backend_install_essentials/tasks/main.yml
@@ -1,4 +1,4 @@
-- name: Install IM
+- name: Install imagemagick
   apt: name={{ item }} state=present
   with_items:
     - imagemagick

diff --git a/roles/general/tasks/basic_packages.yml b/roles/general/tasks/basic_packages.yml
@@ -1,3 +1,3 @@
 ---
-- name: Install VIM
+- name: Install vim
   apt: name=vim state=present