Commit 0a991949 by John Jarvis

Changing the edx_platform var name

parent 23d2e8f5
...@@ -46,7 +46,7 @@ source /etc/profile ...@@ -46,7 +46,7 @@ source /etc/profile
source {{venv_dir}}/bin/activate source {{venv_dir}}/bin/activate
export PATH=$PATH:/opt/www/.gem/bin export PATH=$PATH:/opt/www/.gem/bin
cd {{platform_code_dir}} cd {{edx_platform_code_dir}}
BRANCH="origin/feature/edx-west/stanford-theme" BRANCH="origin/feature/edx-west/stanford-theme"
......
...@@ -32,14 +32,14 @@ ...@@ -32,14 +32,14 @@
# Ruby plays that need to be run after platform updates. # Ruby plays that need to be run after platform updates.
- name: gem | gem install bundler - name: gem | gem install bundler
shell: RBENV_ROOT={{ rbenv_root }} GEM_HOME={{ gem_home }} {{ rbenv_root }}/shims/gem install bundle chdir={{ platform_code_dir }} shell: RBENV_ROOT={{ rbenv_root }} GEM_HOME={{ gem_home }} {{ rbenv_root }}/shims/gem install bundle chdir={{ edx_platform_code_dir }}
tags: tags:
- ruby - ruby
- deploy - deploy
- install - install
- name: bundle | bundle install - name: bundle | bundle install
shell: RBENV_ROOT={{ rbenv_root }} GEM_HOME={{ gem_home }} {{ gem_home }}/bin/bundle install --binstubs chdir={{ platform_code_dir }} shell: RBENV_ROOT={{ rbenv_root }} GEM_HOME={{ gem_home }} {{ gem_home }}/bin/bundle install --binstubs chdir={{ edx_platform_code_dir }}
tags: tags:
- ruby - ruby
- deploy - deploy
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
# Node play that need to be run after platform updates. # Node play that need to be run after platform updates.
- name: Install edx-platform npm dependencies - name: Install edx-platform npm dependencies
shell: npm install chdir={{ platform_code_dir }} shell: npm install chdir={{ edx_platform_code_dir }}
tags: tags:
- npm - npm
- update - update
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
# Need to use shell rather than pip so that we can maintain the context of our current working directory; some # Need to use shell rather than pip so that we can maintain the context of our current working directory; some
# requirements are pathed relative to the edx-platform repo. Using the pip from inside the virtual environment implicitly # requirements are pathed relative to the edx-platform repo. Using the pip from inside the virtual environment implicitly
# installs everything into that virtual environment. # installs everything into that virtual environment.
shell: cd {{ platform_code_dir }} && {{ venv_dir }}/bin/pip install --use-mirrors -r {{ base_requirements_file }} shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install --use-mirrors -r {{ base_requirements_file }}
tags: tags:
- lms - lms
- cms - cms
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
# Need to use shell rather than pip so that we can maintain the context of our current working directory; some # Need to use shell rather than pip so that we can maintain the context of our current working directory; some
# requirements are pathed relative to the edx-platform repo. Using the pip from inside the virtual environment implicitly # requirements are pathed relative to the edx-platform repo. Using the pip from inside the virtual environment implicitly
# installs everything into that virtual environment. # installs everything into that virtual environment.
shell: cd {{ platform_code_dir }} && {{ venv_dir }}/bin/pip install --use-mirrors -r {{ item }} shell: cd {{ edx_platform_code_dir }} && {{ venv_dir }}/bin/pip install --use-mirrors -r {{ item }}
with_items: with_items:
- "{{ repo_requirements_file }}" - "{{ repo_requirements_file }}"
- "{{ github_requirements_file }}" - "{{ github_requirements_file }}"
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
# This check needs to be run to see if rake can be used but its failure should not stop the run. # This check needs to be run to see if rake can be used but its failure should not stop the run.
- name: check if rake gather_assets is available - name: check if rake gather_assets is available
shell: executable=/bin/bash chdir={{ platform_code_dir }} rake -T | grep gather_assets shell: executable=/bin/bash chdir={{ edx_platform_code_dir }} rake -T | grep gather_assets
environment: "{{ deploy_environment }}" environment: "{{ deploy_environment }}"
register: grep_gather_assets register: grep_gather_assets
ignore_errors: yes ignore_errors: yes
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
- deploy - deploy
- name: check if django can collect lms static data - name: check if django can collect lms static data
shell: SERVICE_VARIANT={{ lms_variant }} django-admin.py help collectstatic --pythonpath={{ platform_code_dir }} --settings=lms.envs.aws shell: SERVICE_VARIANT={{ lms_variant }} django-admin.py help collectstatic --pythonpath={{ edx_platform_code_dir }} --settings=lms.envs.aws
register: check_lms_collect_static register: check_lms_collect_static
sudo: yes sudo: yes
sudo_user: www-data sudo_user: www-data
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
- deploy - deploy
- name: check if django can collect cms static data - name: check if django can collect cms static data
shell: SERVICE_VARIANT={{ lms_variant }} django-admin.py help collectstatic --pythonpath={{ platform_code_dir }} --settings=cms.envs.aws shell: SERVICE_VARIANT={{ lms_variant }} django-admin.py help collectstatic --pythonpath={{ edx_platform_code_dir }} --settings=cms.envs.aws
register: check_cms_collect_static register: check_cms_collect_static
sudo: yes sudo: yes
sudo_user: www-data sudo_user: www-data
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
- deploy - deploy
- name: check if django can update cms templates - name: check if django can update cms templates
shell: SERVICE_VARIANT={{ cms_variant }} django-admin.py help update_templates --pythonpath={{ platform_code_dir }} --settings=cms.envs.aws shell: SERVICE_VARIANT={{ cms_variant }} django-admin.py help update_templates --pythonpath={{ edx_platform_code_dir }} --settings=cms.envs.aws
register: check_cms_update_templates register: check_cms_update_templates
sudo: yes sudo: yes
sudo_user: www-data sudo_user: www-data
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
# Gather lms assets using rake if possible # Gather lms assets using rake if possible
- name: gather lms static assets with rake - name: gather lms static assets with rake
shell: executable=/bin/bash chdir={{ platform_code_dir }} SERVICE_VARIANT={{ lms_variant }} rake lms:gather_assets:aws shell: executable=/bin/bash chdir={{ edx_platform_code_dir }} SERVICE_VARIANT={{ lms_variant }} rake lms:gather_assets:aws
when: grep_gather_assets.rc == 0 when: grep_gather_assets.rc == 0
notify: notify:
- stop edxapp - stop edxapp
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
# Gather lms assets using django if necessary(When rake doesn't know how) # Gather lms assets using django if necessary(When rake doesn't know how)
- name: gather lms static assets with django - name: gather lms static assets with django
shell: SERVICE_VARIANT={{ lms_variant }} django-admin.py collectstatic --pythonpath={{ platform_code_dir }} --settings=lms.envs.aws --noinput --verbosity=0 shell: SERVICE_VARIANT={{ lms_variant }} django-admin.py collectstatic --pythonpath={{ edx_platform_code_dir }} --settings=lms.envs.aws --noinput --verbosity=0
when: grep_gather_assets.rc != 0 and check_lms_collect_static.rc == 0 when: grep_gather_assets.rc != 0 and check_lms_collect_static.rc == 0
notify: notify:
- stop edxapp - stop edxapp
...@@ -182,7 +182,7 @@ ...@@ -182,7 +182,7 @@
# Gather cms assets using rake if possible # Gather cms assets using rake if possible
- name: gather cms static assets with rake - name: gather cms static assets with rake
# script: gather_assets.sh # script: gather_assets.sh
shell: executable=/bin/bash chdir={{ platform_code_dir }} SERVICE_VARIANT={{ cms_variant }} rake cms:gather_assets:aws shell: executable=/bin/bash chdir={{ edx_platform_code_dir }} SERVICE_VARIANT={{ cms_variant }} rake cms:gather_assets:aws
when: grep_gather_assets.rc == 0 when: grep_gather_assets.rc == 0
notify: notify:
- stop edxapp - stop edxapp
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
- deploy - deploy
- name: gather cms static assets with django - name: gather cms static assets with django
shell: SERVICE_VARIANT={{ cms_variant }} django-admin.py collectstatic --pythonpath={{ platform_code_dir }} --settings=lms.envs.aws --noinput --verbosity=0 shell: SERVICE_VARIANT={{ cms_variant }} django-admin.py collectstatic --pythonpath={{ edx_platform_code_dir }} --settings=lms.envs.aws --noinput --verbosity=0
when: grep_gather_assets.rc != 0 and check_cms_collect_static.rc == 0 when: grep_gather_assets.rc != 0 and check_cms_collect_static.rc == 0
notify: notify:
- stop edxapp - stop edxapp
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
- deploy - deploy
- name: update cms templates - name: update cms templates
shell: SERVICE_VARIANT={{ cms_variant }} django-admin.py update_templates --pythonpath={{ platform_code_dir }} --settings=cms.envs.aws shell: SERVICE_VARIANT={{ cms_variant }} django-admin.py update_templates --pythonpath={{ edx_platform_code_dir }} --settings=cms.envs.aws
when: check_cms_update_templates.rc == 0 when: check_cms_update_templates.rc == 0
notify: notify:
- stop edxapp - stop edxapp
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# Do A Checkout # Do A Checkout
- name: git checkout edx-platform repo into $app_base_dir - name: git checkout edx-platform repo into $app_base_dir
git: dest={{platform_code_dir}} repo={{lms_source_repo}} version={{lms_version}} git: dest={{edx_platform_code_dir}} repo={{lms_source_repo}} version={{lms_version}}
environment: environment:
GIT_SSH: /tmp/git_ssh.sh GIT_SSH: /tmp/git_ssh.sh
tags: tags:
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
# Do Post Checkout Tasks. # Do Post Checkout Tasks.
- name: create platform code dir - name: create platform code dir
file: path={{platform_code_dir}} state=directory owner=www-data group=www-data mode=755 file: path={{edx_platform_code_dir}} state=directory owner=www-data group=www-data mode=755
tags: tags:
- lms - lms
- cms - cms
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
# portions of the deploy needs to be incorporated here. # portions of the deploy needs to be incorporated here.
- name: sets permissions on platform code dir and contents - name: sets permissions on platform code dir and contents
file: path={{platform_code_dir}} state=directory owner=www-data group=www-data recurse=yes file: path={{edx_platform_code_dir}} state=directory owner=www-data group=www-data recurse=yes
# Post Checkout tasks will get run as handlers when the {{ platform_code_dir }} is ready. # Post Checkout tasks will get run as handlers when the {{ edx_platform_code_dir }} is ready.
# Look at the handlers/main.yml in this role for a description of the tasks stated below. # Look at the handlers/main.yml in this role for a description of the tasks stated below.
tags: tags:
- lms - lms
......
...@@ -19,7 +19,7 @@ env LANG=en_US.UTF-8 ...@@ -19,7 +19,7 @@ env LANG=en_US.UTF-8
env DJANGO_SETTINGS_MODULE=cms.envs.aws env DJANGO_SETTINGS_MODULE=cms.envs.aws
env SERVICE_VARIANT="cms" env SERVICE_VARIANT="cms"
chdir {{platform_code_dir}} chdir {{edx_platform_code_dir}}
setuid www-data setuid www-data
exec {{venv_dir}}/bin/gunicorn_django -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{platform_code_dir}} --settings=cms.envs.aws exec {{venv_dir}}/bin/gunicorn_django -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{edx_platform_code_dir}} --settings=cms.envs.aws
...@@ -18,10 +18,10 @@ env LANG=en_US.UTF-8 ...@@ -18,10 +18,10 @@ env LANG=en_US.UTF-8
env DJANGO_SETTINGS_MODULE=lms.envs.aws env DJANGO_SETTINGS_MODULE=lms.envs.aws
env SERVICE_VARIANT="lms-preview" env SERVICE_VARIANT="lms-preview"
chdir {{platform_code_dir}} chdir {{edx_platform_code_dir}}
setuid www-data setuid www-data
exec {{venv_dir}}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{platform_code_dir}} lms.wsgi exec {{venv_dir}}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{edx_platform_code_dir}} lms.wsgi
post-start script post-start script
while true while true
......
...@@ -18,10 +18,10 @@ env LANG=en_US.UTF-8 ...@@ -18,10 +18,10 @@ env LANG=en_US.UTF-8
env DJANGO_SETTINGS_MODULE=lms.envs.aws env DJANGO_SETTINGS_MODULE=lms.envs.aws
env SERVICE_VARIANT="lms-xml" env SERVICE_VARIANT="lms-xml"
chdir {{platform_code_dir}} chdir {{edx_platform_code_dir}}
setuid www-data setuid www-data
exec {{venv_dir}}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{platform_code_dir}} lms.wsgi exec {{venv_dir}}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{edx_platform_code_dir}} lms.wsgi
post-start script post-start script
while true while true
......
...@@ -18,10 +18,10 @@ env LANG=en_US.UTF-8 ...@@ -18,10 +18,10 @@ env LANG=en_US.UTF-8
env DJANGO_SETTINGS_MODULE=lms.envs.aws env DJANGO_SETTINGS_MODULE=lms.envs.aws
env SERVICE_VARIANT="lms" env SERVICE_VARIANT="lms"
chdir {{platform_code_dir}} chdir {{edx_platform_code_dir}}
setuid www-data setuid www-data
exec {{venv_dir}}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{platform_code_dir}} lms.wsgi exec {{venv_dir}}/bin/gunicorn --preload -b 127.0.0.1:$PORT -w $WORKERS --timeout=300 --pythonpath={{edx_platform_code_dir}} lms.wsgi
post-start script post-start script
while true while true
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
# when the role is included # when the role is included
--- ---
# install dir for the edx-platform repo
edx_platform_code_dir: "{{ app_base_dir }}/edx-platform"
# Default nginx listen ports # Default nginx listen ports
# These should be overrided if you want # These should be overrided if you want
# to serve all content on port 80 # to serve all content on port 80
...@@ -44,12 +47,12 @@ edxapp_theme_version: 'HEAD' ...@@ -44,12 +47,12 @@ edxapp_theme_version: 'HEAD'
# make this the public URL instead of writable # make this the public URL instead of writable
lms_source_repo: git://github.com/edx/edx-platform.git lms_source_repo: git://github.com/edx/edx-platform.git
lms_version: 'HEAD' lms_version: 'HEAD'
local_requirements_file: "{{ platform_code_dir }}/requirements/edx/local.txt" local_requirements_file: "{{ edx_platform_code_dir }}/requirements/edx/local.txt"
pre_requirements_file: "{{ platform_code_dir }}/requirements/edx/pre.txt" pre_requirements_file: "{{ edx_platform_code_dir }}/requirements/edx/pre.txt"
post_requirements_file: "{{ platform_code_dir }}/requirements/edx/post.txt" post_requirements_file: "{{ edx_platform_code_dir }}/requirements/edx/post.txt"
base_requirements_file: "{{ platform_code_dir }}/requirements/edx/base.txt" base_requirements_file: "{{ edx_platform_code_dir }}/requirements/edx/base.txt"
github_requirements_file: "{{ platform_code_dir }}/requirements/edx/github.txt" github_requirements_file: "{{ edx_platform_code_dir }}/requirements/edx/github.txt"
repo_requirements_file: "{{ platform_code_dir }}/requirements/edx/repo.txt" repo_requirements_file: "{{ edx_platform_code_dir }}/requirements/edx/repo.txt"
lms_debian_pkgs: lms_debian_pkgs:
- apparmor-utils - apparmor-utils
...@@ -140,4 +143,4 @@ deploy_environment: ...@@ -140,4 +143,4 @@ deploy_environment:
SKIP_WS_MIGRATIONS: 1 SKIP_WS_MIGRATIONS: 1
RBENV_ROOT: "{{ rbenv_root }}" RBENV_ROOT: "{{ rbenv_root }}"
GEM_HOME: "{{ gem_home }}" GEM_HOME: "{{ gem_home }}"
PATH: "{{ venv_dir }}/bin:{{ platform_code_dir }}/bin:{{ rbenv_root }}/bin:{{ rbenv_root }}/shims:{{ gem_home }}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" PATH: "{{ venv_dir }}/bin:{{ edx_platform_code_dir }}/bin:{{ rbenv_root }}/bin:{{ rbenv_root }}/shims:{{ gem_home }}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
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