Skip to content

C
configuration
Commit 71a658ec by John Jarvis
Options

updating package_data.yaml

parent ccc81d07
Showing with 184 additions and 60 deletions
package_data.yaml
# datadog integration configuration # datadog integration configuration
datadog_api: '' datadog_api: '0020f57b408f21e598b40b95ffb9d5de'
# repo_dirs : Exhaustive list of repo-dirs and their corresponding repo-names # repo_dirs : Exhaustive list of repo-dirs and their corresponding repo-names
# the repos are specified by basename(repo_dir), therefore basename(repo_dir) # the repos are specified by basename(repo_dir), therefore basename(repo_dir)
...@@ -17,15 +17,118 @@ service_repos: ...@@ -17,15 +17,118 @@ service_repos:
- analytics-experiments - analytics-experiments
repo_dirs: repo_dirs:
/etc/puppet/environments/dev: MITx/configuration
/etc/puppet/environments/prod: MITx/configuration
/etc/puppet/environments/sandbox: MITx/configuration
/etc/puppet/environments/stage: MITx/configuration
/etc/puppet/environments/edge_production: MITx/configuration
/etc/puppet/environments/edge_staging: MITx/configuration
/etc/puppet/environments/edge_sandbox: MITx/configuration
/etc/puppet/environments/refactor: MITx/configuration
/etc/puppet/environments/prod_mktg: MITx/configuration
/etc/puppet/hiera: MITx/hiera
/opt/wwc/analytics-experiments: MITx/analytics-experiments /opt/wwc/analytics-experiments: MITx/analytics-experiments
/opt/wwc/grading-controller: edx/grading-controller /opt/wwc/grading-controller: edx/grading-controller
/opt/wwc/ease: edx/ease /opt/wwc/ease: edx/ease
/opt/wwc/askbot-devel: MITx/askbot-devel
/opt/wwc/edx-platform: edx/edx-platform /opt/wwc/edx-platform: edx/edx-platform
/opt/wwc/data/cs50: MITx/cs50
/opt/wwc/data/edx4edx: MITx/edx4edx
/opt/wwc/data/700x: MITx/700x
/opt/wwc/xqueue: edx/xqueue /opt/wwc/xqueue: edx/xqueue
/opt/wwc/xserver: edx/xserver /opt/wwc/xserver: edx/xserver
/opt/wwc/certificates: edx/certificates /opt/wwc/certificates: edx/certificates
/opt/wwc/drupal: MITx/drupal
/opt/wwc/latex2edx: edx/latex2edx_xserver /opt/wwc/latex2edx: edx/latex2edx_xserver
/opt/wwc/worker: edx/edx-platform /opt/wwc/worker: edx/edx-platform
/opt/sysadmin: MITx/sysadmin
/opt/wwc/data/content-berkeley-cs169.2x~2012_Fall: MITx/content-berkeley-cs169.2x
/opt/wwc/data/content-berkeley-cs169.2x~2013_Spring: MITx/content-berkeley-cs169.2x
/opt/wwc/data/content-berkeley-cs169x~2012_Fall: MITx/content-berkeley-cs169x
/opt/wwc/data/content-berkeley-cs169x~2013_Spring: MITx/content-berkeley-cs169x
/opt/wwc/data/content-berkeley-cs169x~2013_March: MITx/content-berkeley-cs169x
/opt/wwc/data/content-berkeley-cs169x~fa12: MITx/content-berkeley-cs169x
/opt/wwc/data/content-berkeley-cs184x~2012_Fall: MITx/content-berkeley-cs184x
/opt/wwc/data/content-berkeley-cs184x~2013_Spring: MITx/content-berkeley-cs184x
/opt/wwc/data/content-berkeley-cs188x~2012_Fall: MITx/content-berkeley-cs188x
/opt/wwc/data/content-berkeley-cs188x~2013_Spring: MITx/content-berkeley-cs188x
/opt/wwc/data/content-berkeley-cs188x~fa12: MITx/content-berkeley-cs188x
/opt/wwc/data/content-berkeley-cs188x~sp13: MITx/content-berkeley-cs188x
/opt/wwc/data/content-berkeley-cs191x~2013_Spring: MITx/content-berkeley-cs191x
/opt/wwc/data/content-berkeley-stat2.1x~2013_Spring: MITx/content-berkeley-stat2.1x
/opt/wwc/data/content-berkeley-stat2.2x~2013_April: MITx/content-berkeley-stat2.2x
/opt/wwc/data/content-berkeley-stat2.3x~2013_SOND: MITx/content-berkeley-stat2.3x
/opt/wwc/data/content-berkeley-cs169x~2013_Spring_SPOC_Binghamton: MITx/content-berkeley-cs169x
/opt/wwc/data/content-berkeley-cs169x~2013_Spring_SPOC_HPU: MITx/content-berkeley-cs169x
/opt/wwc/data/content-berkeley-cs169x~2013_Spring_SPOC_Mills: MITx/content-berkeley-cs169x
/opt/wwc/data/content-berkeley-cs169x~2013_Spring_SPOC_UCCS: MITx/content-berkeley-cs169x
/opt/wwc/data/content-berkeley-cs169x~2013_Spring_SPOC_UIowa: MITx/content-berkeley-cs169x
/opt/wwc/data/content-berkeley-cs169x~2013_Spring_SPOC_UNCC: MITx/content-berkeley-cs169x
/opt/wwc/data/content-harvard-cs50x~2012: MITx/cs50
/opt/wwc/data/content-harvard-cs50x~2012H: MITx/cs50
/opt/wwc/data/content-harvard-healthx~2013_Spring: MITx/content-harvard-healthx
/opt/wwc/data/content-harvard-heroesx~2013_Spring: MITx/content-harvard-heroesx
/opt/wwc/data/content-harvard-copyrightx~2013_Spring: MITx/content-harvard-copyrightx
/opt/wwc/data/content-harvard-id270x: MITx/content-harvard-id270x
/opt/wwc/data/content-harvard-justicex~2013_Spring: MITx/content-harvard-justicex
/opt/wwc/data/content-mit-201x~2013_Spring: MITx/content-mit-201x
/opt/wwc/data/content-mit-1473x~2013_Spring: MITx/content-mit-1473x
/opt/wwc/data/content-mit-1473x~MIT_2013_Spring: MITx/content-mit-1473x
/opt/wwc/data/content-mit-3091x~2012_Fall: MITx/3.091x
/opt/wwc/data/content-mit-3091x~2013_Spring: MITx/3.091x
/opt/wwc/data/content-mit-3091x~MIT_2012_Fall: MITx/3.091x
/opt/wwc/data/content-mit-6002x: MITx/content-mit-6002x
/opt/wwc/data/content-mit-6002x~2012_Fall: MITx/content-mit-6002x
/opt/wwc/data/content-mit-6002x~2013_Spring: MITx/content-mit-6002x
/opt/wwc/data/content-mit-600x~2012_Fall: MITx/6.00x
/opt/wwc/data/content-mit-600x~2013_IAP: MITx/6.00x
/opt/wwc/data/content-mit-600x~2013_Spring: MITx/6.00x
/opt/wwc/data/content-mit-600x~MIT_2012_Fall: MITx/6.00x
/opt/wwc/data/content-mit-600x~MIT_2013_Spring: MITx/6.00x
/opt/wwc/data/content-sjsu-6002x: MITx/content-sjsu-6002x
/opt/wwc/data/content-num-6002x: MITx/content-num-6002x
/opt/wwc/data/content-startups-001x: MITx/content-startups-001x
/opt/wwc/data/content-mit-7012x~2013_Spring: MITx/content-mit-7012x
/opt/wwc/data/content-mit-7012x~MIT_2013_Spring: MITx/content-mit-7012x
/opt/wwc/data/content-mit-802x~2013_Spring: MITx/content-mit-802x
/opt/wwc/data/content-harvard-hls1xa~Copyright: MITx/content-harvard-hls1xa
/opt/wwc/data/content-harvard-hls1xb~Copyright: MITx/content-harvard-hls1xb
/opt/wwc/data/content-harvard-hls1xc~Copyright: MITx/content-harvard-hls1xc
/opt/wwc/data/content-harvard-hls1xd~Copyright: MITx/content-harvard-hls1xd
/opt/wwc/data/content-utaustin-001x: MITx/content-utaustin-001x
/opt/wwc/data/content-utaustin-002x: MITx/content-utaustin-002x
/opt/wwc/data/content-utaustin-003x: MITx/content-utaustin-003x
/opt/wwc/data/content-utaustin-004x: MITx/content-utaustin-004x
/opt/wwc/data/content-edx-demo: MITx/content-edx-demo
/opt/wwc/data/content-demos: MITx/content-demos
/opt/wwc/data/content-harvard-spu27x: MITx/content-harvard-spu27x
/opt/wwc/data/content-mit-mrev~2013_Summer: MITx/content-mit-mrev
/opt/wwc/data/content-georgetown-bioethics: MITx/content-georgetown-bioethics
/opt/wwc/data/content-georgetown-globalization: MITx/content-georgetown-globalization
/opt/wwc/data/content-delft-water~2013_Fall: MITx/content-delft-water
/opt/wwc/data/content-delft-solar~2013_Fall: MITx/content-delft-solar
/opt/wwc/data/content-openended-101x: MITx/content-openended-101x
/opt/wwc/data/content-anu-astro~2013_SOND: MITx/content-anu-astro
/opt/wwc/data/content-anu-india~2013_SOND: MITx/content-anu-india
/opt/wwc/data/content-georgetown-medx202-01~2014_SOND: MITx/content-georgetown-medx202-01
/opt/wwc/data/content-harvard-change~2014_Jan: MITx/content-harvard-change
/opt/wwc/data/content-harvard-china~2013_Oct: MITx/content-harvard-china
/opt/wwc/data/content-harvard-einstein~2013_SOND: MITx/content-harvard-einstein
/opt/wwc/data/content-rice-bioc372~2014_Jan: MITx/content-rice-bioc372
/opt/wwc/data/content-rice-phys102~2013_Oct: MITx/content-rice-phys102
/opt/wwc/data/content-rice-reli157x~2014_SOND: MITx/content-rice-reli157x
/opt/wwc/data/content-wellesley-anthropology207x~2013_SOND: MITx/content-wellesley-anthropology207x
/opt/wwc/data/content-wellesley-eng112x~2014_SOND: MITx/content-wellesley-eng112x
/opt/wwc/data/content-wellesley-hist229x~2013_SOND: MITx/content-wellesley-hist229x
/opt/wwc/data/content-wellesley-soc108x~2014_SOND: MITx/content-wellesley-soc108x
/opt/wwc/data/content-mit-16101x~2013_SOND: MITx/content-mit-16101x
/opt/wwc/data/content-mit-16110x~2013_SOND: MITx/content-mit-16110x
/opt/wwc/data/content-mit-2400x~2013_SOND: MITx/content-mit-2400x
/opt/wwc/data/content-mit-4605x~2013_SOND: MITx/content-mit-4605x
/opt/wwc/data/content-mit-801x~2013_SOND: MITx/content-mit-801x
/opt/wwc/data/content-mit-3086x~2013_SOND: MITx/content-mit-3086x
# {pre,post}_checkout_regex: # {pre,post}_checkout_regex:
# What actions to take before and after a repo checkout. # What actions to take before and after a repo checkout.
...@@ -134,76 +237,97 @@ post_checkout_regex: !!omap ...@@ -134,76 +237,97 @@ post_checkout_regex: !!omap
- ^edx-platform$|^content-.*$: - ^edx-platform$|^content-.*$:
- | - |
# Requirements files have been moved, so check the location first #install local requirements for the platform
if [[ -e /opt/wwc/edx-platform/local-requirements.txt ]]; then if [[ -e /opt/wwc/edx-platform/requirements/edx/local.txt ]]; then
cd /opt/wwc/edx-platform cd /opt/wwc/edx-platform
sudo -E /opt/edx/bin/pip install -q --upgrade --no-deps -r \ sudo -E /opt/edx/bin/pip install -q --upgrade --no-deps --ignore-installed \
/opt/wwc/edx-platform/local-requirements.txt --exists-action w -r /opt/wwc/edx-platform/requirements/edx/local.txt
fi
# Then check the new location
if [[ -e /opt/wwc/edx-platform/requirements/local.txt ]]; then
cd /opt/wwc/edx-platform
sudo -E /opt/edx/bin/pip install -q --upgrade --no-deps -r \
/opt/wwc/edx-platform/requirements/local.txt
fi fi
#install local requirements for the sandbox
if [[ -e /etc/apparmor.d/code.sandbox ]]; then
sudo /usr/sbin/aa-complain /etc/apparmor.d/code.sandbox
if [[ -e /opt/wwc/edx-platform/requirements/edx-sandbox/local.txt ]]; then
cd /opt/wwc/edx-platform
sudo -E /opt/edx-sandbox/bin/pip install -q --upgrade --no-deps --ignore-installed \
--exists-action w -r /opt/wwc/edx-platform/requirements/edx-sandbox/local.txt
fi
sudo /usr/sbin/aa-enforce /etc/apparmor.d/code.sandbox
fi
- ^edx-platform$: - ^edx-platform$:
- | - |
# On servers running the workers, which run from the same cloned
# repo, we don't want to run collect static. This could cause
# problems because the cache's are shared with the edx-platform instances
# it's also simply not necessary for the workers as they have no
# view component.
edx_workers_status=$(service edx-workers status 2>/dev/null || true)
# git.py already handle prerequisites, so don't let rake try to install them as well # git.py already handle prerequisites, so don't let rake try to install them as well
export NO_PREREQ_INSTALL=1 if [[ -z $edx_workers_status ]]; then
# This is not a developer workspace, so we don't want to do the workspace migrations export NO_PREREQ_INSTALL=1
# Instead, we rely on having a clean checkout every time # This is not a developer workspace, so we don't want to do the workspace migrations
export SKIP_WS_MIGRATIONS=1 # Instead, we rely on having a clean checkout every time
export SKIP_WS_MIGRATIONS=1
export RBENV_ROOT=/opt/www/.rbenv export RBENV_ROOT=/opt/www/.rbenv
# Use rbenv binaries # Use rbenv binaries
export PATH=$RBENV_ROOT/shims:$RBENV_ROOT/bin:$PATH export PATH=$RBENV_ROOT/shims:$RBENV_ROOT/bin:$PATH
# Use binaries installed in rbenv # Use binaries installed in rbenv
export PATH=/opt/wwc/edx-platform/bin:$PATH export PATH=/opt/wwc/edx-platform/bin:$PATH
# Use binaries installed in virtualenv # Use binaries installed in virtualenv
export PATH=/opt/edx/bin:$PATH export PATH=/opt/edx/bin:$PATH
eval "$(rbenv init -)" eval "$(rbenv init -)"
# {{}} is used here because of python .format upstream # {{}} is used here because of python .format upstream
LMS_VARIANT="$(ls -1 /opt/wwc/lms*.env.json | tail -1 | xargs -i basename {{}} .env.json)" LMS_VARIANT="$(ls -1 /opt/wwc/lms*.env.json | tail -1 | xargs -i basename {{}} .env.json)"
export RUN="sudo -E -u www-data env SERVICE_VARIANT=$LMS_VARIANT PATH=$PATH" export RUN="sudo -E -u www-data env SERVICE_VARIANT=$LMS_VARIANT PATH=$PATH"
cd /opt/wwc/edx-platform cd /opt/wwc/edx-platform
# If we're gather_assets is available, run it (to compile coffee and sass, and then collectstatic) # If we're gather_assets is available, run it (to compile coffee and sass, and then collectstatic)
if $(rake -T | grep --quiet gather_assets); then if $(rake -T | grep --quiet gather_assets); then
$RUN rake lms:gather_assets:aws $RUN rake lms:gather_assets:aws
# Otherwise, we're still using django pipeline, so just run collectstatic [TODO: Remove this clause when gather_assets gets to prod] # Otherwise, we're still using django pipeline, so just run collectstatic [TODO: Remove this clause when gather_assets gets to prod]
elif $($RUN django-admin.py help collectstatic --pythonpath=/opt/wwc/edx-platform --settings=lms.envs.aws &>/dev/null); then elif $($RUN django-admin.py help collectstatic --pythonpath=/opt/wwc/edx-platform --settings=lms.envs.aws &>/dev/null); then
$RUN django-admin.py collectstatic \ $RUN django-admin.py collectstatic \
--pythonpath=/opt/wwc/edx-platform --settings=lms.envs.aws \ --pythonpath=/opt/wwc/edx-platform --settings=lms.envs.aws \
--noinput --verbosity=0 --noinput --verbosity=0
fi
fi fi
- | - |
export NO_PREREQ_INSTALL=1 # On servers running the workers, which run from the same cloned
export SKIP_WS_MIGRATIONS=1 # repo, we don't want to run collect static. This could cause
export RBENV_ROOT=/opt/www/.rbenv # problems because the cache's are shared with the edx-platform instances
# Use rbenv binaries # it's also simply not necessary for the workers as they have no
export PATH=$RBENV_ROOT/shims:$RBENV_ROOT/bin:$PATH # view component.
# Use binaries installed in rbenv edx_workers_status=$(service edx-workers status 2>/dev/null || true)
export PATH=/opt/wwc/edx-platform/bin:$PATH # git.py already handle prerequisites, so don't let rake try to install them as well
# Use binaries installed in virtualenv if [[ -z $edx_workers_status ]]; then
export PATH=/opt/edx/bin:$PATH export NO_PREREQ_INSTALL=1
eval "$(rbenv init -)" export SKIP_WS_MIGRATIONS=1
export RUN="sudo -E -u www-data env SERVICE_VARIANT=cms PATH=$PATH" export RBENV_ROOT=/opt/www/.rbenv
cd /opt/wwc/edx-platform # Use rbenv binaries
# If we're gather_assets is available, run it (to compile coffee and sass, and then collectstatic) export PATH=$RBENV_ROOT/shims:$RBENV_ROOT/bin:$PATH
if $(rake -T | grep --quiet gather_assets); then # Use binaries installed in rbenv
$RUN rake cms:gather_assets:aws export PATH=/opt/wwc/edx-platform/bin:$PATH
# Otherwise, we're still using django pipeline, so just run collectstatic [TODO: Remove this clause when gather_assets gets to prod] # Use binaries installed in virtualenv
elif $($RUN django-admin.py help collectstatic --pythonpath=/opt/wwc/edx-platform --settings=cms.envs.aws &>/dev/null) && [[ -r /opt/wwc/cms.auth.json ]]; then export PATH=/opt/edx/bin:$PATH
$RUN django-admin.py collectstatic \ eval "$(rbenv init -)"
--pythonpath=/opt/wwc/edx-platform --settings=cms.envs.aws \ export RUN="sudo -E -u www-data env SERVICE_VARIANT=cms PATH=$PATH"
--noinput --verbosity=0 cd /opt/wwc/edx-platform
fi # If we're gather_assets is available, run it (to compile coffee and sass, and then collectstatic)
if $($RUN django-admin.py help update_templates --pythonpath=/opt/wwc/edx-platform --settings=cms.envs.aws &>/dev/null) && [[ -r /opt/wwc/cms.auth.json ]]; then if $(rake -T | grep --quiet gather_assets); then
$RUN django-admin.py update_templates \ $RUN rake cms:gather_assets:aws
--pythonpath=/opt/wwc/edx-platform --settings=cms.envs.aws # Otherwise, we're still using django pipeline, so just run collectstatic [TODO: Remove this clause when gather_assets gets to prod]
elif $($RUN django-admin.py help collectstatic --pythonpath=/opt/wwc/edx-platform --settings=cms.envs.aws &>/dev/null) && [[ -r /opt/wwc/cms.auth.json ]]; then
$RUN django-admin.py collectstatic \
--pythonpath=/opt/wwc/edx-platform --settings=cms.envs.aws \
--noinput --verbosity=0
fi
if $($RUN django-admin.py help update_templates --pythonpath=/opt/wwc/edx-platform --settings=cms.envs.aws &>/dev/null) && [[ -r /opt/wwc/cms.auth.json ]]; then
$RUN django-admin.py update_templates \
--pythonpath=/opt/wwc/edx-platform --settings=cms.envs.aws
fi
fi fi
- ^edx-platform$|^content-.*$: - ^edx-platform$|^content-.*$:
- | - |
edxapp_status=$(service edxapp status 2>/dev/null || true) edxapp_status=$(service edxapp status 2>/dev/null || true)
......
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