From d1d665d283437130467c3cb705090554fcc59b73 Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 11 Aug 2015 14:15:05 -0400 Subject: [PATCH 1/5] Remove insights from Cypress --- playbooks/edx_sandbox.yml | 1 - 1 file changed, 1 deletion(-) 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' } From 155da62ec56a093c81dceff0b9282f61f4d6e65e Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Wed, 12 Aug 2015 09:50:47 -0400 Subject: [PATCH 2/5] migrate.sh defaults to named-release/cypress --- util/vagrant/migrate.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" From 52b489dd75fcab6dac684f0c33c5bfcf07340538 Mon Sep 17 00:00:00 2001 From: Xavier Antoviaque Date: Tue, 18 Aug 2015 10:16:41 +0200 Subject: [PATCH 3/5] Add playbook for integration deployments - Shorter build time --- playbooks/opencraft_integration.yml | 31 +++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 playbooks/opencraft_integration.yml diff --git a/playbooks/opencraft_integration.yml b/playbooks/opencraft_integration.yml new file mode 100644 index 00000000000..bfd05aa947e --- /dev/null +++ b/playbooks/opencraft_integration.yml @@ -0,0 +1,31 @@ +--- + +# 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' + 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 From de0f55bc8dfeb377bee5c9b8b9254e28aaa2f04b Mon Sep 17 00:00:00 2001 From: Tim Krones Date: Mon, 30 May 2016 14:24:13 +0200 Subject: [PATCH 4/5] Fix "String ... is too long for username" error. Stop reusing ECOMMERCE_DEFAULT_DB_NAME for corresponding user. Use ECOMMERCE_DATABASES.default.USER instead. --- playbooks/roles/edxlocal/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 9471fd39ac7ed9b929bd153a5902f8300727f5aa Mon Sep 17 00:00:00 2001 From: Martin Fitzpatrick Date: Mon, 22 Aug 2016 10:15:22 +0200 Subject: [PATCH 5/5] Add Let's Encrypt to integration playbook Let's Encrypt role and config settings added to integration playbook, to automatically bring up integration test servers with https. --- playbooks/opencraft_integration.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/playbooks/opencraft_integration.yml b/playbooks/opencraft_integration.yml index bfd05aa947e..dffb68c25b1 100644 --- a/playbooks/opencraft_integration.yml +++ b/playbooks/opencraft_integration.yml @@ -12,6 +12,11 @@ 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 @@ -29,3 +34,4 @@ - edxlocal - mongo - edxapp + - lets_encrypt