diff --git a/playbooks/edx_sandbox.yml b/playbooks/edx_sandbox.yml index b008badc20d..7ceab338ff1 100644 --- a/playbooks/edx_sandbox.yml +++ b/playbooks/edx_sandbox.yml @@ -36,7 +36,6 @@ - edxapp - notifier - analytics_api - - insights - edx_notes_api - demo - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' } diff --git a/playbooks/opencraft_integration.yml b/playbooks/opencraft_integration.yml new file mode 100644 index 00000000000..dffb68c25b1 --- /dev/null +++ b/playbooks/opencraft_integration.yml @@ -0,0 +1,37 @@ +--- + +# Example sandbox configuration +# for single server community +# installs + +- name: Configure instance(s) + hosts: all + sudo: True + gather_facts: True + vars: + migrate_db: "yes" + openid_workaround: True + EDXAPP_LMS_NGINX_PORT: '80' + EDXAPP_LMS_SSL_NGINX_PORT: '443' + NGINX_ENABLE_SSL: True + LETS_ENCRYPT_DOMAINS: + - "{{ EDXAPP_LMS_SITE_NAME }}" + - "{{ EDXAPP_CMS_SITE_NAME }}" + edx_platform_version: 'master' + # Set to false if deployed behind another proxy/load balancer. + NGINX_SET_X_FORWARDED_HEADERS: True + # These should stay false for the public AMI + COMMON_ENABLE_DATADOG: False + COMMON_ENABLE_SPLUNKFORWARDER: False + ENABLE_LEGACY_ORA: !!null + roles: + - role: nginx + nginx_sites: + - cms + - lms + nginx_default_sites: + - lms + - edxlocal + - mongo + - edxapp + - lets_encrypt diff --git a/playbooks/roles/edxlocal/tasks/main.yml b/playbooks/roles/edxlocal/tasks/main.yml index a2826dc4f27..8c3c0083ed0 100644 --- a/playbooks/roles/edxlocal/tasks/main.yml +++ b/playbooks/roles/edxlocal/tasks/main.yml @@ -111,7 +111,7 @@ - name: setup users for ecommerce mysql_user: > - name="{{ ECOMMERCE_DEFAULT_DB_NAME }}" + name="{{ ECOMMERCE_DATABASES.default.USER }}" password="{{ ECOMMERCE_DATABASES.default.PASSWORD }}" priv='{{ ECOMMERCE_DEFAULT_DB_NAME }}.*:SELECT,INSERT,UPDATE,DELETE' when: ECOMMERCE_DEFAULT_DB_NAME is defined diff --git a/util/vagrant/migrate.sh b/util/vagrant/migrate.sh index 9dee19e9c8b..6aa98d6fece 100755 --- a/util/vagrant/migrate.sh +++ b/util/vagrant/migrate.sh @@ -2,7 +2,7 @@ # defaults CONFIGURATION="fullstack" -TARGET="named-release/cypress.rc" +TARGET="named-release/cypress" INTERACTIVE=true OPENEDX_ROOT="/edx"