Skip to content

C
configuration
Commit e2fe6746 by John Jarvis
Options

Merge pull request #292 from edx/jarv/edxapp-mixedmodule 

Jarv/edxapp mixedmodule
parents ff71848b a0b37ec6
Showing with 131 additions and 345 deletions
playbooks/roles/edxapp/defaults/main.yml
...@@ -2,14 +2,16 @@ ...@@ -2,14 +2,16 @@
# when the role is included # when the role is included
--- ---
# These are default values for the env and auth # These are variables that default to a localhost
# configuration files. There should be no # setup and are meant to be overwritten for
# host identifying or sensitive information and # different environments.
# the defaults should be appropriate for running #
# all roles on a single instance # Variables in all caps are environment specific
# Lowercase variables are internal to the role
# These are custom variables that can be overridden #
# on the command line to change specific values in the hash # Defaults specified here should not contain
# any secrets or host identifying information.
EDXAPP_LMS_BASE: '' EDXAPP_LMS_BASE: ''
EDXAPP_PREVIEW_LMS_BASE: '' EDXAPP_PREVIEW_LMS_BASE: ''
EDXAPP_CMS_BASE: '' EDXAPP_CMS_BASE: ''
...@@ -20,10 +22,11 @@ EDXAPP_XQUEUE_DJANGO_AUTH: ...@@ -20,10 +22,11 @@ EDXAPP_XQUEUE_DJANGO_AUTH:
username: 'lms' username: 'lms'
password: 'password' password: 'password'
EDXAPP_MONGO_HOST: ['localhost'] EDXAPP_MONGO_HOSTS: ['localhost']
EDXAPP_MONGO_PASSWORD: 'password' EDXAPP_MONGO_PASSWORD: 'password'
EDXAPP_MONGO_PORT: 27017 EDXAPP_MONGO_PORT: 27017
EDXAPP_MONGO_USER: 'mongo' EDXAPP_MONGO_USER: 'mongo'
EDXAPP_MONGO_DB_NAME: 'edxapp'
EDXAPP_MYSQL_DB_NAME: 'edxapp' EDXAPP_MYSQL_DB_NAME: 'edxapp'
EDXAPP_MYSQL_USER: 'root' EDXAPP_MYSQL_USER: 'root'
...@@ -73,130 +76,143 @@ EDXAPP_LOGGING_ENV: 'sandbox' ...@@ -73,130 +76,143 @@ EDXAPP_LOGGING_ENV: 'sandbox'
EDXAPP_SYSLOG_SERVER: '' EDXAPP_SYSLOG_SERVER: ''
EDXAPP_RABBIT_HOSTNAME: 'rabbit.{{ENV_NAME}}.vpc.edx.org' EDXAPP_RABBIT_HOSTNAME: 'rabbit.{{ENV_NAME}}.vpc.edx.org'
EDXAPP_XML_MAPPINGS: {}
#-------- Everything below this line is internal to the role ------------
#Use YAML references (& and *) and hash merge <<: to factor out shared settings #Use YAML references (& and *) and hash merge <<: to factor out shared settings
#see http://atechie.net/2009/07/merging-hashes-in-yaml-conf-files/ #see http://atechie.net/2009/07/merging-hashes-in-yaml-conf-files/
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
'AWS_SECRET_ACCESS_KEY': $EDXAPP_AWS_SECRET_ACCESS_KEY AWS_SECRET_ACCESS_KEY: $EDXAPP_AWS_SECRET_ACCESS_KEY
'SECRET_KEY': $EDXAPP_EDXAPP_SECRET_KEY SECRET_KEY: $EDXAPP_EDXAPP_SECRET_KEY
'XQUEUE_INTERFACE': XQUEUE_INTERFACE:
'basic_auth': $EDXAPP_XQUEUE_BASIC_AUTH basic_auth: $EDXAPP_XQUEUE_BASIC_AUTH
'django_auth': $EDXAPP_XQUEUE_DJANGO_AUTH django_auth: $EDXAPP_XQUEUE_DJANGO_AUTH
'url': $EDXAPP_XQUEUE_URL url: $EDXAPP_XQUEUE_URL
'CONTENTSTORE': CONTENTSTORE:
'ENGINE': 'xmodule.contentstore.mongo.MongoContentStore' ENGINE: 'xmodule.contentstore.mongo.MongoContentStore'
'OPTIONS': OPTIONS:
'db': $EDXAPP_MONGO_DB_NAME db: $EDXAPP_MONGO_DB_NAME
'host': $EDXAPP_MONGO_HOSTS host: $EDXAPP_MONGO_HOSTS
'password': $EDXAPP_MONGO_PASSWORD password: $EDXAPP_MONGO_PASSWORD
'port': $EDXAPP_MONGO_PORT port: $EDXAPP_MONGO_PORT
'user': $EDXAPP_MONGO_USER user: $EDXAPP_MONGO_USER
'MODULESTORE': MODULESTORE:
'default': default:
'ENGINE': 'xmodule.modulestore.mongo.DraftMongoModuleStore' ENGINE: 'xmodule.modulestore.mongo.DraftMongoModuleStore'
'OPTIONS': &generic_modulestore_default_options OPTIONS: &generic_modulestore_default_options
'collection': 'modulestore' collection: 'modulestore'
'db': $EDXAPP_MONGO_DB_NAME db: $EDXAPP_MONGO_DB_NAME
'default_class': 'xmodule.hidden_module.HiddenDescriptor' default_class: 'xmodule.hidden_module.HiddenDescriptor'
'fs_root': '/opt/wwc/data' fs_root: '/opt/wwc/data'
'host': $EDXAPP_MONGO_HOSTS host: $EDXAPP_MONGO_HOSTS
'password': $EDXAPP_MONGO_PASSWORD password: $EDXAPP_MONGO_PASSWORD
'port': $EDXAPP_MONGO_PORT port: $EDXAPP_MONGO_PORT
'render_template': 'mitxmako.shortcuts.render_to_string' render_template: 'mitxmako.shortcuts.render_to_string'
'user': $EDXAPP_MONGO_USER user: $EDXAPP_MONGO_USER
# Needed for the CMS to be able to run update_templates # Needed for the CMS to be able to run update_templates
'direct': direct:
'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore' ENGINE: 'xmodule.modulestore.mongo.MongoModuleStore'
'OPTIONS': *generic_modulestore_default_options OPTIONS: *generic_modulestore_default_options
'DATABASES': DATABASES:
'default': default:
'ENGINE': 'django.db.backends.mysql' ENGINE: 'django.db.backends.mysql'
'NAME': $EDXAPP_MYSQL_DB_NAME NAME: $EDXAPP_MYSQL_DB_NAME
'USER': $EDXAPP_MYSQL_USER USER: $EDXAPP_MYSQL_USER
'PASSWORD': $EDXAPP_MYSQL_PASSWORD PASSWORD: $EDXAPP_MYSQL_PASSWORD
'HOST': $EDXAPP_MYSQL_HOST HOST: $EDXAPP_MYSQL_HOST
'PORT': $EDXAPP_MYSQL_PORT PORT: $EDXAPP_MYSQL_PORT
'PEARSON_TEST_PASSWORD': $EDXAPP_PEARSON_TEST_PASSWORD PEARSON_TEST_PASSWORD: $EDXAPP_PEARSON_TEST_PASSWORD
'OPEN_ENDED_GRADING_INTERFACE': OPEN_ENDED_GRADING_INTERFACE:
'url': $EDXAPP_OEE_URL url: $EDXAPP_OEE_URL
'password': $EDXAPP_OEE_PASSWORD password: $EDXAPP_OEE_PASSWORD
'peer_grading': 'peer_grading' peer_grading: 'peer_grading'
'staff_grading': 'staff_grading' staff_grading: 'staff_grading'
'grading_controller': 'grading_controller' grading_controller: 'grading_controller'
'username': $EDXAPP_OEE_USER username: $EDXAPP_OEE_USER
'ANALYTICS_API_KEY': $EDXAPP_ANALYTICS_API_KEY ANALYTICS_API_KEY: $EDXAPP_ANALYTICS_API_KEY
'ZENDESK_USER': $EDXAPP_ZENDESK_USER ZENDESK_USER: $EDXAPP_ZENDESK_USER
'ZENDESK_API_KEY': $EDXAPP_ZENDESK_API_KEY ZENDESK_API_KEY: $EDXAPP_ZENDESK_API_KEY
'CELERY_BROKER_USER': $EDXAPP_CELERY_USER CELERY_BROKER_USER: $EDXAPP_CELERY_USER
'CELERY_BROKER_PASSWORD': $EDXAPP_CELERY_PASSWORD CELERY_BROKER_PASSWORD: $EDXAPP_CELERY_PASSWORD
generic_env_config: &edxapp_generic_env generic_env_config: &edxapp_generic_env
'LMS_BASE': $EDXAPP_LMS_BASE LMS_BASE: $EDXAPP_LMS_BASE
'CMS_BASE': $EDXAPP_CMS_BASE CMS_BASE: $EDXAPP_CMS_BASE
'BOOK_URL': $EDXAPP_BOOK_URL BOOK_URL: $EDXAPP_BOOK_URL
'CERT_QUEUE': 'certificates' CERT_QUEUE: 'certificates'
'LOCAL_LOGLEVEL': $EDXAPP_LOG_LEVEL LOCAL_LOGLEVEL: $EDXAPP_LOG_LEVEL
# default email backed set to local SMTP # default email backed set to local SMTP
'EMAIL_BACKEND': $EDXAPP_EMAIL_BACKEND EMAIL_BACKEND: $EDXAPP_EMAIL_BACKEND
'MITX_FEATURES': $EDXAPP_MITX_FEATURES MITX_FEATURES: $EDXAPP_MITX_FEATURES
'WIKI_ENABLED': true WIKI_ENABLED: true
'SYSLOG_SERVER': $EDXAPP_SYSLOG_SERVER SYSLOG_SERVER: $EDXAPP_SYSLOG_SERVER
'SITE_NAME': $EDXAPP_SITE_NAME SITE_NAME: $EDXAPP_SITE_NAME
'LOG_DIR': '/mnt/logs/edx' LOG_DIR: '/mnt/logs/edx'
'MEDIA_URL': $EDXAPP_MEDIA_URL MEDIA_URL: $EDXAPP_MEDIA_URL
'ANALYTICS_SERVER_URL': $EDXAPP_ANALYTICS_SERVER_URL ANALYTICS_SERVER_URL: $EDXAPP_ANALYTICS_SERVER_URL
'FEEDBACK_SUBMISSION_EMAIL': $EDXAPP_FEEDBACK_SUBMISSION_EMAIL FEEDBACK_SUBMISSION_EMAIL: $EDXAPP_FEEDBACK_SUBMISSION_EMAIL
'TIME_ZONE': 'America/New_York' TIME_ZONE: 'America/New_York'
'CACHES': CACHES:
'default': &default_generic_cache default: &default_generic_cache
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache' BACKEND: 'django.core.cache.backends.memcached.MemcachedCache'
'KEY_FUNCTION': 'util.memcache.safe_key' KEY_FUNCTION: 'util.memcache.safe_key'
'KEY_PREFIX': 'sandbox_default' KEY_PREFIX: 'sandbox_default'
'LOCATION': $EDXAPP_MEMCACHE LOCATION: $EDXAPP_MEMCACHE
'general': general:
<<: *default_generic_cache <<: *default_generic_cache
'KEY_PREFIX': 'sandbox_general' KEY_PREFIX: 'sandbox_general'
'mongo_metadata_inheritance': mongo_metadata_inheritance:
<<: *default_generic_cache <<: *default_generic_cache
'KEY_PREFIX': 'integration_mongo_metadata_inheritance' KEY_PREFIX: 'integration_mongo_metadata_inheritance'
'staticfiles': staticfiles:
<<: *default_generic_cache <<: *default_generic_cache
'KEY_PREFIX': 'integration_static_files' KEY_PREFIX: 'integration_static_files'
'celery': celery:
<<: *default_generic_cache <<: *default_generic_cache
'KEY_PREFIX': 'integration_celery' KEY_PREFIX: 'integration_celery'
'CELERY_BROKER_TRANSPORT': 'amqp' CELERY_BROKER_TRANSPORT: 'amqp'
'CELERY_BROKER_HOSTNAME': $EDXAPP_RABBIT_HOSTNAME CELERY_BROKER_HOSTNAME: $EDXAPP_RABBIT_HOSTNAME
'COMMENTS_SERVICE_URL': $EDXAPP_COMMENTS_SERVICE_URL COMMENTS_SERVICE_URL: $EDXAPP_COMMENTS_SERVICE_URL
'LOGGING_ENV': $EDXAPP_LOGGING_ENV LOGGING_ENV: $EDXAPP_LOGGING_ENV
'SESSION_COOKIE_DOMAIN': !!null SESSION_COOKIE_DOMAIN: !!null
'COMMENTS_SERVICE_KEY': $EDXAPP_COMMENTS_SERVICE_KEY COMMENTS_SERVICE_KEY: $EDXAPP_COMMENTS_SERVICE_KEY
'SEGMENT_IO_LMS': true SEGMENT_IO_LMS: true
'CODE_JAIL': CODE_JAIL:
'limits': limits:
'VMEM': 0 VMEM: 0
'REALTIME': 3 REALTIME: 3
lms_auth_config: lms_auth_config:
<<: *edxapp_generic_auth <<: *edxapp_generic_auth
'MODULESTORE': MODULESTORE:
'default': default:
'ENGINE': 'xmodule.modulestore.mongo.MongoModuleStore' ENGINE: 'xmodule.modulestore.mixed.MixedModuleStore'
'OPTIONS': *generic_modulestore_default_options OPTIONS:
mappings: $EDXAPP_XML_MAPPINGS
stores:
xml:
ENGINE: 'xmodule.modulestore.xml.XMLModuleStore'
OPTIONS:
data_dir: '/opt/wwc/data'
default_class: 'xmodule.hidden_module.HiddenDescriptor'
default:
OPTIONS:
default_class: 'xmodule.hidden_module.HiddenDescriptor'
host: $EDXAPP_MONGO_HOSTS
db: $EDXAPP_MONGO_DB_NAME
collection: 'modulestore'
render_template: 'mitxmako.shortcuts.render_to_string'
user: $EDXAPP_MONGO_USER
password: $EDXAPP_MONGO_PASSWORD
port: $EDXAPP_MONGO_PORT
fs_root: '/opt/wwc/data'
ENGINE: 'xmodule.modulestore.mongo.MongoModuleStore'
lms_env_config: lms_env_config:
<<: *edxapp_generic_env <<: *edxapp_generic_env
lms_xml_auth_config:
<<: *edxapp_generic_auth
'MODULESTORE':
'default':
'ENGINE': 'xmodule.modulestore.xml.XMLModuleStore'
'OPTIONS':
'data_dir': '/opt/wwc/data'
'default_class': 'xmodule.hidden_module.HiddenDescriptor'
lms_xml_env_config:
<<: *edxapp_generic_env
cms_auth_config: cms_auth_config:
<<: *edxapp_generic_auth <<: *edxapp_generic_auth
cms_env_config: cms_env_config:
...@@ -216,19 +232,16 @@ edx_platform_code_dir: "{{ app_base_dir }}/edx-platform" ...@@ -216,19 +232,16 @@ edx_platform_code_dir: "{{ app_base_dir }}/edx-platform"
# to serve all content on port 80 # to serve all content on port 80
lms_xml_nginx_port: 18030
lms_nginx_port: 80 lms_nginx_port: 80
lms_preview_nginx_port: 18020 lms_preview_nginx_port: 18020
cms_nginx_port: 18010 cms_nginx_port: 18010
edxapp_cms_app_port: 8010 edxapp_cms_app_port: 8010
edxapp_lms_app_port: 8000 edxapp_lms_app_port: 8000
edxapp_lms_xml_app_port: 8030
edxapp_lms_preview_app_port: 8020 edxapp_lms_preview_app_port: 8020
edxapp_cms_app_address: 127.0.0.1 edxapp_cms_app_address: 127.0.0.1
edxapp_lms_app_address: 127.0.0.1 edxapp_lms_app_address: 127.0.0.1
edxapp_lms_xml_app_address: 127.0.0.1
edxapp_lms_preview_app_address: 127.0.0.1 edxapp_lms_preview_app_address: 127.0.0.1
# These vars are for creating the application json config # These vars are for creating the application json config
...@@ -249,7 +262,6 @@ edxapp_lms_env: 'lms.envs.aws' ...@@ -249,7 +262,6 @@ edxapp_lms_env: 'lms.envs.aws'
worker_core_mult: worker_core_mult:
lms: 4 lms: 4
lms_preview: 2 lms_preview: 2
lms_xml: 2
cms: 2 cms: 2
#Theming #Theming
......
playbooks/roles/edxapp/handlers/main.yml
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
service: name=edxapp state=started service: name=edxapp state=started
tags: tags:
- lms - lms
- lms-xml
- lms-preview - lms-preview
- cms - cms
- deploy - deploy
...@@ -12,7 +11,6 @@ ...@@ -12,7 +11,6 @@
service: name=edxapp state=stopped service: name=edxapp state=stopped
tags: tags:
- lms - lms
- lms-xml
- lms-preview - lms-preview
- cms - cms
- deploy - deploy
...@@ -21,7 +19,6 @@ ...@@ -21,7 +19,6 @@
service: name=edxapp state=restarted service: name=edxapp state=restarted
tags: tags:
- lms - lms
- lms-xml
- lms-preview - lms-preview
- cms - cms
- deploy - deploy
playbooks/roles/edxapp/tasks/deploy.yml
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
when: celery_worker is not defined when: celery_worker is not defined
tags: tags:
- lms - lms
- lms-xml
- lms-preview - lms-preview
- cms - cms
- deploy - deploy
...@@ -46,7 +45,6 @@ ...@@ -46,7 +45,6 @@
when: edxapp_theme_name != '' when: edxapp_theme_name != ''
tags: tags:
- cms - cms
- lms-xml
- lms-preview - lms-preview
- lms - lms
- update - update
...@@ -171,7 +169,6 @@ ...@@ -171,7 +169,6 @@
tags: tags:
- lms - lms
- lms-preview - lms-preview
- lms-xml
- deploy - deploy
# Gather cms assets using rake if possible # Gather cms assets using rake if possible
...@@ -198,7 +195,6 @@ ...@@ -198,7 +195,6 @@
tags: tags:
- deploy - deploy
- lms - lms
- lms-xml
- lms-preview - lms-preview
- cms - cms
- syncdb - syncdb
...@@ -209,7 +205,6 @@ ...@@ -209,7 +205,6 @@
tags: tags:
- deploy - deploy
- lms - lms
- lms-xml
- lms-preview - lms-preview
- cms - cms
- syncdb - syncdb
...@@ -220,7 +215,6 @@ ...@@ -220,7 +215,6 @@
tags: tags:
- deploy - deploy
- lms - lms
- lms-xml
- lms-preview - lms-preview
- cms - cms
- migrate - migrate
...@@ -230,7 +224,6 @@ ...@@ -230,7 +224,6 @@
when: celery_worker is not defined when: celery_worker is not defined
tags: tags:
- lms - lms
- lms-xml
- lms-preview - lms-preview
- cms - cms
- deploy - deploy
......
playbooks/roles/edxapp/tasks/lms-xml.yml deleted 100644 → 0
# requires:
# - group_vars/all
# - common/tasks/main.yml
# - nginx/tasks/main.yml
---
- name: create lms-xml application config
template: src=lms-xml.env.json.j2 dest=$app_base_dir/lms-xml.env.json mode=640 owner=www-data group=adm
tags:
- lms-xml-env
- lmx-xml
- update
- name: create lms-xml auth file
template: src=lms-xml.auth.json.j2 dest=$app_base_dir/lms-xml.auth.json mode=640 owner=www-data group=adm
tags:
- lms-xml-env
- lmx-xml
- update
- name: Create lms-xml log target directory
file: path={{log_base_dir}}/lms-xml state=directory owner=syslog group=adm mode=2770
tags:
- lms-xml
- lms-xml-env
- logging
- update
- include: ../../nginx/tasks/nginx_site.yml state=link site_name=lms-xml
when: celery_worker is not defined
- include: ../../nginx/tasks/nginx_site.yml state=link site_name=lms-xml-backend
when: celery_worker is not defined
# Creates upstart file
- include: upstart.yml basename=lms-xml
when: celery_worker is not defined
- include: upstart.yml basename=edx-worker-lms-xml
when: celery_worker is defined
playbooks/roles/edxapp/tasks/main.yml
...@@ -38,8 +38,6 @@ ...@@ -38,8 +38,6 @@
- include: lms.yml - include: lms.yml
when: "'lms' in service_variants_enabled" when: "'lms' in service_variants_enabled"
- include: lms-xml.yml
when: "'lms-xml' in service_variants_enabled"
- include: cms.yml - include: cms.yml
when: "'cms' in service_variants_enabled" when: "'cms' in service_variants_enabled"
- include: lms-preview.yml - include: lms-preview.yml
......
playbooks/roles/edxapp/templates/edx-worker-lms-xml.conf.j2 deleted 100644 → 0
# gunicorn
# Templated and placed by ansible from jinja2 source
# lms-xml Celery Worker Upstart Script
description "cms celery worker"
stop on stopping edx-workers
respawn
instance edx.${SERVICE_VARIANT}.core.${QUEUE}
#env NEW_RELIC_CONFIG_FILE=/opt/wwc/newrelic.ini
#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
env CONCURRENCY=${CONCURRENCY}
env LOGLEVEL=info
env DJANGO_SETTINGS_MODULE={{worker_django_settings_module}}
env PYTHONPATH={{edx_platform_code_dir}}
env SERVICE_VARIANT=${SERVICE_VARIANT}
setuid www-data
chdir {{edx_platform_code_dir}}
exec {{venv_dir}}/bin/python {{edx_platform_code_dir}}/manage.py lms --service-variant=$SERVICE_VARIANT --settings=$DJANGO_SETTINGS_MODULE celery worker --loglevel=$LOGLEVEL --queues=edx.${SERVICE_VARIANT}.core.${QUEUE} --hostname=edx.${SERVICE_VARIANT}.core.${QUEUE}.`hostname` --concurrency=$CONCURRENCY
playbooks/roles/edxapp/templates/edx-workers.conf.j2
...@@ -20,10 +20,4 @@ pre-start script ...@@ -20,10 +20,4 @@ pre-start script
start edx-worker-lms QUEUE=high CONCURRENCY=4 SERVICE_VARIANT=lms start edx-worker-lms QUEUE=high CONCURRENCY=4 SERVICE_VARIANT=lms
{% endif %} {% endif %}
{% if 'lms-xml' in service_variants_enabled %}
start edx-worker-lms-xml QUEUE=low CONCURRENCY=1 SERVICE_VARIANT=lms-xml
start edx-worker-lms-xml QUEUE=default CONCURRENCY=3 SERVICE_VARIANT=lms-xml
start edx-worker-lms-xml QUEUE=high CONCURRENCY=4 SERVICE_VARIANT=lms-xml
{% endif %}
end script end script
playbooks/roles/edxapp/templates/edxapp.conf.j2
...@@ -11,12 +11,6 @@ stop on runlevel [!2345] ...@@ -11,12 +11,6 @@ stop on runlevel [!2345]
## ##
pre-start script pre-start script
{% if 'lms-xml' in service_variants_enabled %}
if [ -e /etc/init/lms-xml.conf ]; then
start wait-for-state WAIT_FOR=lms-xml WAITER=$UPSTART_JOB
fi
{% endif %}
{% if 'lms' in service_variants_enabled %} {% if 'lms' in service_variants_enabled %}
if [ -e /etc/init/lms.conf ]; then if [ -e /etc/init/lms.conf ]; then
start wait-for-state WAIT_FOR=lms WAITER=$UPSTART_JOB start wait-for-state WAIT_FOR=lms WAITER=$UPSTART_JOB
...@@ -51,12 +45,6 @@ end script ...@@ -51,12 +45,6 @@ end script
pre-stop script pre-stop script
{% if 'lms-xml' in service_variants_enabled %}
if [ -e /etc/init/lms-xml.conf ]; then
start wait-for-state WAIT_FOR=lms-xml WAITER=$UPSTART_JOB TARGET_GOAL="stop"
fi
{% endif %}
{% if 'lms' in service_variants_enabled %} {% if 'lms' in service_variants_enabled %}
if [ -e /etc/init/lms.conf ]; then if [ -e /etc/init/lms.conf ]; then
start wait-for-state WAIT_FOR=lms WAITER=$UPSTART_JOB TARGET_GOAL="stop" start wait-for-state WAIT_FOR=lms WAITER=$UPSTART_JOB TARGET_GOAL="stop"
......
playbooks/roles/edxapp/templates/lms-xml.conf.j2 deleted 100644 → 0
# gunicorn
# Templated and placed by ansible from jinja2 source
description "lms-xml gunicorn server"
start on started edxapp
stop on stopped edxapp
respawn
respawn limit 3 30
env PID=/var/tmp/lms-xml.pid
#env NEW_RELIC_CONFIG_FILE={{app_base_dir}}/newrelic.ini
#env NEWRELIC={{venv_dir}}/bin/newrelic-admin
{% if ansible_processor|length > 0 %}
env WORKERS={{ ansible_processor|length * worker_core_mult.lms_xml }}
{% else %}
env WORKERS={{ worker_core_mult.lms_xml }}
{% endif %}
env PORT={{edxapp_lms_xml_app_port}}
env ADDRESS={{edxapp_lms_xml_app_address}}
env LANG=en_US.UTF-8
env DJANGO_SETTINGS_MODULE=lms.envs.aws
env SERVICE_VARIANT="lms-xml"
chdir {{edx_platform_code_dir}}
setuid www-data
exec {{venv_dir}}/bin/gunicorn --preload -b $ADDRESS:$PORT -w $WORKERS --timeout=300 --pythonpath={{edx_platform_code_dir}} lms.wsgi
post-start script
while true
do
if $(curl -s -i localhost:$PORT/heartbeat | egrep -q '200 OK'); then
break;
else
sleep 1;
fi
done
end script
playbooks/roles/nginx/templates/lms-xml-backend.j2 deleted 100644 → 0
upstream lms-xml-backend {
# For a TCP configuration:
server 127.0.0.1:8030 fail_timeout=0;
}
playbooks/roles/nginx/templates/lms-xml.j2 deleted 100644 → 0
server {
# LMS-preview configuration file for nginx, templated by ansible
listen {{lms_xml_nginx_port}};
# CS184 requires uploads of up to 4MB for submitting screenshots.
# CMS requires larger value for course assest, values provided
# via hiera.
client_max_body_size 4M;
rewrite ^(.*)/favicon.ico$ /static/images/favicon.ico last;
location @proxy_to_lms-preview_app {
proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
proxy_set_header X-Forwarded-Port $http_x_forwarded_port;
proxy_set_header X-Forwarded-For $http_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_pass http://lms-xml-backend;
}
location @proxy_to_lms-xml_app {
proxy_set_header X-Forwarded-Proto $http_x_forwarded_proto;
proxy_set_header X-Forwarded-Port $http_x_forwarded_port;
proxy_set_header X-Forwarded-For $http_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_redirect off;
proxy_pass http://lms-xml-backend;
}
location / {
try_files $uri @proxy_to_lms-xml_app;
}
# No basic auth security on the github_service_hook url, so that github can use it for cms
location /github_service_hook {
try_files $uri @proxy_to_lms-xml_app;
}
# No basic auth security on the heartbeat url, so that ELB can use it
location /heartbeat {
try_files $uri @proxy_to_lms-xml_app;
}
# Check security on this
location ~ /static/(?P<file>.*) {
root {{app_base_dir}};
try_files /staticfiles/$file /course_static/$file =404;
# return a 403 for static files that shouldn't be
# in the staticfiles directory
location ~ ^/static/(?:.*)(?:\.xml|\.json|README.TXT) {
return 403;
}
# Set django-pipelined files to maximum cache time
location ~ "/static/(?P<collected>.*\.[0-9a-f]{12}\..*)" {
expires max;
# Without this try_files, files that have been run through
# django-pipeline return 404s
try_files /staticfiles/$collected /course_static/$collected =404;
}
# Expire other static files immediately (there should be very few / none of these)
expires epoch;
}
# Forward to HTTPS if we're an HTTP request...
if ($http_x_forwarded_proto = "http") {
set $do_redirect "true";
}
# Run our actual redirect...
if ($do_redirect = "true") {
rewrite ^ https://$host$request_uri? permanent;
}
# Monitoring support for datadog.
location /nginx_status {
stub_status on;
access_log off;
allow 127.0.0.1/32;
deny all;
}
}
playbooks/roles/rabbitmq/defaults/main.yml
...@@ -19,7 +19,6 @@ rabbitmq_ip: "{{ ansible_default_ipv4.address }}" ...@@ -19,7 +19,6 @@ rabbitmq_ip: "{{ ansible_default_ipv4.address }}"
# Vars meant to be overridden. # Vars meant to be overridden.
RABBIT_ERLANG_COOKIE: 'DEFAULT_COOKIE' RABBIT_ERLANG_COOKIE: 'DEFAULT_COOKIE'
RABBIT_USERS: RABBIT_USERS:
admins:
- name: 'admin' - name: 'admin'
password: 'the example admin password' password: 'the example admin password'
- name: 'edx' - name: 'edx'
......
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