Merge pull request #2151 from edx/master

Merge rbenv change to rc.
openedx-unsupported · Jul 16, 2015 · aab8bad · aab8bad
2 parents 17a7045 + a8e9768
commit aab8bad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/playbooks/roles/jenkins_master/defaults/main.yml b/playbooks/roles/jenkins_master/defaults/main.yml
@@ -18,7 +18,7 @@ jenkins_plugins:
     - { name: "copy-to-slave", version: "1.4.3" }
     - { name: "credentials", version: "1.8.3" }
     - { name: "dashboard-view", version: "2.9.1" }
-    - { name: "ec2", version: "1.23" }
+    - { name: "ec2", version: "1.28" }
     - { name: "github", version: "1.8" }
     - { name: "github-api", version: "1.44" }
     - { name: "github-oauth", version: "0.14" }

diff --git a/playbooks/roles/local_dev/tasks/main.yml b/playbooks/roles/local_dev/tasks/main.yml
@@ -16,12 +16,14 @@
   user: name={{ forum_user }} groups={{ common_web_group }} append=yes
   when: forum_user is defined
 
+# Need this in order for the forum user to install and uninstall
+# gems using 'bundle' or 'gem'.  Can't make it 760 because that
+# would break the bin directory under .gem
 - name: set forum rbenv and gem permissions
   file:
-    path={{ item }} state=directory recurse=yes mode=770
+    path={{ item }} state=directory recurse=yes mode="g+rw"
   with_items:
     - "{{ forum_app_dir }}/.gem"
-    - "{{ forum_app_dir }}/.rbenv"
   when: forum_user is defined
 
 # Create scripts to configure environment