Merge pull request #2669 from edx/clintonb/forums-fix

Forums Fixes

playbooks/roles/forum/defaults/main.yml

 ---
 forum_app_dir: "{{ COMMON_APP_DIR }}/forum"
 forum_code_dir: "{{ forum_app_dir }}/cs_comments_service"
+forum_binstubs_dir: "{{ forum_code_dir }}/bin"
 forum_data_dir: "{{ COMMON_DATA_DIR }}/forum"
 forum_rbenv_dir: "{{ forum_app_dir }}"
 forum_rbenv_root: "{{ forum_app_dir }}/.rbenv"
@@ -9,7 +10,7 @@ forum_rbenv_bin: "{{ forum_rbenv_root }}/bin"
 forum_supervisor_wrapper: "{{ forum_app_dir }}/forum-supervisor.sh"
 forum_gem_root: "{{ forum_rbenv_dir }}/.gem"
 forum_gem_bin: "{{ forum_gem_root }}/bin"
-forum_path: "{{ forum_code_dir }}/bin:{{ forum_rbenv_bin }}:{{ forum_rbenv_shims }}:{{ forum_gem_bin }}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+forum_path: "{{ forum_binstubs_dir }}:{{ forum_rbenv_bin }}:{{ forum_rbenv_shims }}:{{ forum_gem_bin }}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 FORUM_MONGO_USER: "cs_comments_service"
 FORUM_MONGO_PASSWORD: "password"
@@ -59,7 +60,7 @@ forum_environment:
   LISTEN_PORT: "{{ FORUM_LISTEN_PORT }}"
 
 forum_user: "forum"
-forum_ruby_version: "1.9.3-p448"
+forum_ruby_version: "1.9.3-p551"
 forum_source_repo: "https://github.com/edx/cs_comments_service.git"
 forum_version: "master"
 

playbooks/roles/forum/meta/main.yml

@@ -3,8 +3,6 @@ dependencies:
   - common
   - supervisor
   - role: rbenv
-    # TODO: setting the rbenv ownership to
-    # the common_web_user is a workaround
-    rbenv_user: "{{ common_web_user }}"
+    rbenv_user: "{{ forum_user }}"
     rbenv_dir: "{{ forum_app_dir }}"
     rbenv_ruby_version: "{{ forum_ruby_version }}"

playbooks/roles/forum/tasks/deploy.yml

@@ -49,12 +49,9 @@
     - install
     - install:code
 
-# TODO: This is done as the common_web_user
-# since the process owner needs write access
-# to the rbenv
 - name: install comments service bundle
-  shell: bundle install --deployment chdir={{ forum_code_dir }}
-  sudo_user: "{{ common_web_user }}"
+  shell: bundle install --deployment --path {{ forum_gem_root }} chdir={{ forum_code_dir }}
+  sudo_user: "{{ forum_user }}"
   environment: "{{ forum_environment }}"
   notify: restart the forum service
   tags:

playbooks/roles/forum/tasks/main.yml

@@ -23,18 +23,23 @@
 
 - name: create application user
   user: >
-    name="{{ forum_user }}" home="{{ forum_app_dir }}"
-    createhome=no
+    name="{{ forum_user }}"
+    home="{{ forum_app_dir }}"
+    createhome=yes
     shell=/bin/false
+    generate_ssh_key=yes
   notify: restart the forum service
   tags:
     - install
     - install:base
-  
-- name: create forum app dir
+
+# Ensure the directory is accessible to the web service
+- name: set forum app dir permissions
   file: >
-    path="{{ forum_app_dir }}" state=directory
-    owner="{{ forum_user }}" group="{{ common_web_group }}"
+    path="{{ forum_app_dir }}"
+    state=directory
+    owner="{{ forum_user }}"
+    group="{{ common_web_group }}"
   notify: restart the forum service
   tags:
     - install
@@ -60,4 +65,4 @@
     - install
     - install:base
     
-- include: deploy.yml tags=deploy
+- include: deploy.yml tags=deploy
\ No newline at end of file

playbooks/roles/forum/templates/forum-supervisor.sh.j2

@@ -6,7 +6,7 @@ cd {{ forum_code_dir }}
 {% if devstack %}
 {{ forum_rbenv_shims }}/ruby app.rb
 {% elif FORUM_USE_TCP %}
-{{ forum_gem_bin }}/unicorn -c config/unicorn_tcp.rb
+{{ forum_binstubs_dir }}/unicorn -c config/unicorn_tcp.rb
 {% else %}
-{{ forum_gem_bin }}/unicorn -c config/unicorn.rb
+{{ forum_binstubs_dir }}/unicorn -c config/unicorn.rb
 {% endif %}

playbooks/roles/local_dev/tasks/main.yml

@@ -21,23 +21,6 @@
     group: "{{ common_web_group }}"
   when: edxapp_user is defined
 
-# Ensure forum user has permissions to access .gem and .rbenv
-# This is a little twisty: the forum role sets the owner and group to www-data
-# So we add the forum user to the www-data group and give group write permissions
-- name: add forum user to www-data group
-  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="g+rw"
-  with_items:
-    - "{{ forum_app_dir }}/.gem"
-  when: forum_user is defined
-
 # Create scripts to configure environment
 - name: create login scripts
   template:

playbooks/roles/rbenv/defaults/main.yml

 ---
 
-rbenv_version: 'v0.4.0'
-rbenv_bundler_version: '1.3.2'
-rbenv_rake_version: '10.0.3'
+rbenv_version: 'v1.0.0'
+rbenv_bundler_version: '1.11.2'
+rbenv_rake_version: '10.4.2'
 rbenv_root: "{{ rbenv_dir }}/.rbenv"
 rbenv_gem_root: "{{ rbenv_dir }}/.gem"
 rbenv_gem_bin: "{{ rbenv_gem_root }}/bin"

playbooks/roles/rbenv/tasks/main.yml

@@ -177,6 +177,14 @@
   tags:
     - install
     - install:base
+
+- name: update rubygems
+  shell: "gem install rubygems-update && update_rubygems"
+  sudo_user: "{{ rbenv_user }}"
+  environment: "{{ rbenv_environment }}"
+  tags:
+    - install
+    - install:base
     
 - name: rehash
   shell: "rbenv rehash"
@@ -184,4 +192,4 @@
   environment: "{{ rbenv_environment }}"
   tags:
     - install
-    - install:base
+    - install:base
\ No newline at end of file