Commit aa17b10a by John Jarvis

updating plays that manage the json files to use new directory structure

parent 41f9ccb3
...@@ -102,6 +102,7 @@ edxapp_rbenv_dir: "{{ edxapp_rbenvs_dir }}/edxapp" ...@@ -102,6 +102,7 @@ edxapp_rbenv_dir: "{{ edxapp_rbenvs_dir }}/edxapp"
edxapp_user: edxapp edxapp_user: edxapp
edxapp_rbenv_root: "{{ edxapp_rbenv_dir }}/.rbenv" edxapp_rbenv_root: "{{ edxapp_rbenv_dir }}/.rbenv"
edxapp_gem_root: "{{ edxapp_rbenv_dir }}/.gem" edxapp_gem_root: "{{ edxapp_rbenv_dir }}/.gem"
edxapp_rbenv_shims: "{{ edxapp_rbenv_root }}/shims"
edxapp_generic_auth_config: &edxapp_generic_auth edxapp_generic_auth_config: &edxapp_generic_auth
AWS_ACCESS_KEY_ID: $EDXAPP_AWS_ACCESS_KEY_ID AWS_ACCESS_KEY_ID: $EDXAPP_AWS_ACCESS_KEY_ID
...@@ -265,7 +266,7 @@ lms_preview_env_config: ...@@ -265,7 +266,7 @@ lms_preview_env_config:
# install dir for the edx-platform repo # install dir for the edx-platform repo
edxapp_code_dir: "{{ app_dir }}/edx-platform" edxapp_code_dir: "{{ edxapp_app_dir }}/edx-platform"
# gunicorn ports/hosts, these shouldn't need to be overridden # gunicorn ports/hosts, these shouldn't need to be overridden
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# - common/tasks/main.yml # - common/tasks/main.yml
--- ---
- name: create cms application config - name: create cms application config
template: src=cms.env.json.j2 dest=$app_dir/cms.env.json mode=640 owner=www-data group=adm template: src=cms.env.json.j2 dest={{ edxapp_app_dir }}/cms.env.json mode=640 owner={{ edxapp_user }}
tags: tags:
- cms-env - cms-env
- cms - cms
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
- deploy - deploy
- name: create cms auth file - name: create cms auth file
template: src=cms.auth.json.j2 dest=$app_dir/cms.auth.json mode=640 owner=www-data group=adm template: src=cms.auth.json.j2 dest={{ edxapp_app_dir }}/cms.auth.json mode=640 owner={{ edxapp_user }}
tags: tags:
- cms-env - cms-env
- cms - cms
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
- deploy - deploy
- name: Create CMS log target directory - name: Create CMS log target directory
file: path={{log_dir}}/cms state=directory owner=syslog group=syslog mode=2750 file: path={{ edxapp_log_dir }}/cms state=directory owner={{ common_log_user }} mode=2750
tags: tags:
- cms - cms
- cms-env - cms-env
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
# Ruby plays that need to be run after platform updates. # Ruby plays that need to be run after platform updates.
- name: edxapp | gem install bundler - name: edxapp | gem install bundler
shell: > shell: >
RBENV_ROOT={{ edxapp_rbenv_root }} GEM_HOME={{ edxapp_gem_root }} {{ edxapp_rbenv_root }}/shims/gem install bundle RBENV_ROOT={{ edxapp_rbenv_root }} GEM_HOME={{ edxapp_gem_root }} {{ edxapp_rbenv_shims }}/gem install bundle
chdir={{ edxapp_code_dir }} chdir={{ edxapp_code_dir }}
sudo_user: "{{ edxapp_user }}" sudo_user: "{{ edxapp_user }}"
tags: tags:
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
- name: edxapp | bundle install - name: edxapp | bundle install
shell: > shell: >
RBENV_ROOT={{ edxapp_rbenv_root }} GEM_HOME={{ edxapp_gem_root }} {{ edxapp_gem_root }}/bin/bundle install --binstubs RBENV_ROOT={{ edxapp_rbenv_root }} GEM_HOME={{ edxapp_gem_root }} {{ edxapp_rbenv_shims }}/bundle install --binstubs
chdir={{ edxapp_code_dir }} chdir={{ edxapp_code_dir }}
sudo_user: "{{ edxapp_user }}" sudo_user: "{{ edxapp_user }}"
tags: tags:
......
...@@ -3,21 +3,21 @@ ...@@ -3,21 +3,21 @@
# - common/tasks/main.yml # - common/tasks/main.yml
--- ---
- name: create lms application config - name: create lms application config
template: src=lms-preview.env.json.j2 dest=$app_dir/lms-preview.env.json mode=640 owner=www-data group=adm template: src=lms-preview.env.json.j2 dest={{ edxapp_app_dir }}/lms-preview.env.json mode=640 owner={{ edxapp_user }}
tags: tags:
- lms-preview - lms-preview
- lms-preview-env - lms-preview-env
- deploy - deploy
- name: create lms auth file - name: create lms auth file
template: src=lms-preview.auth.json.j2 dest=$app_dir/lms-preview.auth.json mode=640 owner=www-data group=adm template: src=lms-preview.auth.json.j2 dest={{ edxapp_app_dir }}/lms-preview.auth.json mode=640 owner={{ edxapp_user }}
tags: tags:
- lms-preview - lms-preview
- lms-preview-env - lms-preview-env
- deploy - deploy
- name: Create lms-preview log target directory - name: Create lms-preview log target directory
file: path={{log_dir}}/lms-preview state=directory owner=syslog group=syslog mode=2750 file: path={{ edxapp_log_dir }}/lms-preview state=directory owner={{ common_log_user }} mode=2750
tags: tags:
- lms-preview - lms-preview
- lms-preview-env - lms-preview-env
......
--- ---
- name: create lms application config - name: create lms application config
template: src=lms.env.json.j2 dest=$app_dir/lms.env.json mode=640 owner=www-data group=adm template: src=lms.env.json.j2 dest={{ edxapp_app_dir }}/lms.env.json mode=640 owner={{ edxapp_user }}
tags: tags:
- lms - lms
- lms-env - lms-env
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
- deploy - deploy
- name: create lms auth file - name: create lms auth file
template: src=lms.auth.json.j2 dest=$app_dir/lms.auth.json mode=640 owner=www-data group=adm template: src=lms.auth.json.j2 dest={{ edxapp_app_dir }}/lms.auth.json mode=640 owner={{ edxapp_user }}
tags: tags:
- lms - lms
- lms-env - lms-env
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
- deploy - deploy
- name: Create lms log target directory - name: Create lms log target directory
file: path={{log_dir}}/lms state=directory owner=syslog group=syslog mode=2750 file: path={{ edxapp_log_dir }}/lms state=directory owner=syslog group={{ common_log_user }} mode=2750
tags: tags:
- lms - lms
- lms-env - lms-env
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment