Merge pull request #1907 from edx/feanil/update_ecommerce_settings

Feanil/update ecommerce settings

playbooks/roles/ecommerce/defaults/main.yml

@@ -35,32 +35,39 @@ ECOMMERCE_VERSION: "master"
 EDX_DJANGO_OSCAR_VERSION: "master"
 EDX_DJANGO_OSCAR_EXTENSIONS_VERSION: "master"
 
-# Default dummy user, override this!!
-ECOMMERCE_USERS:
-  "dummy-api-user": "changeme"
-
 ECOMMERCE_SECRET_KEY: 'Your secret key here'
 ECOMMERCE_TIME_ZONE: 'UTC'
 ECOMMERCE_LANGUAGE_CODE: 'en-us'
-ECOMMERCE_EMAIL_HOST: 'localhost'
-ECOMMERCE_EMAIL_HOST_USER: 'mail_user'
-ECOMMERCE_EMAIL_HOST_PASSWORD: 'mail_password'
-ECOMMERCE_EMAIL_PORT: 587
-ECOMMERCE_AUTH_TOKEN: 'put-your-api-token-here'
+ECOMMERCE_EDX_API_KEY: 'put-your-edx-api-auth-token-here'
+ECOMMERCE_LMS_URL_ROOT: 'https://www.example.com'
+ECOMMERCE_JWT_SECRET_KEY: 'generated-key-that-matches-ECOMMERCE_API_SIGNING_KEY-in-edxapp'
+
+# Generated by the app that you're using as your auth source
+# in most cases this will be the edx-platform 
+ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_KEY : 'some-secret'
+ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_SECRET : 'some-secret'
+ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_ID_TOKEN_DECRYPTION_KEY : 'some-secret'
+ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_URL_ROOT : 'some-secret'
 
 ECOMMERCE_SERVICE_CONFIG:
-  ECOMMERCE_DATABASE: 'reports'
   SECRET_KEY: '{{ ECOMMERCE_SECRET_KEY }}'
   TIME_ZONE: '{{ ECOMMERCE_TIME_ZONE }}'
-  LANGUAGE_CODE: '{{ECOMMERCE_LANGUAGE_CODE }}'
-  # email config
-  EMAIL_HOST: '{{ ECOMMERCE_EMAIL_HOST }}'
-  EMAIL_HOST_PASSWORD: '{{ ECOMMERCE_EMAIL_HOST_PASSWORD }}'
-  EMAIL_HOST_USER: '{{ ECOMMERCE_EMAIL_HOST_USER }}'
-  EMAIL_PORT: $ECOMMERCE_EMAIL_PORT
-  API_AUTH_TOKEN: '{{ ECOMMERCE_AUTH_TOKEN }}'
+  LANGUAGE_CODE: '{{ ECOMMERCE_LANGUAGE_CODE }}'
+  EDX_API_KEY: '{{ ECOMMERCE_EDX_API_KEY }}'
   STATICFILES_DIRS: []
 #  STATICFILES_DIRS: ['{{ ecommerce_static_path }}']
+
+  LMS_URL_ROOT: '{{ ECOMMERCE_LMS_URL_ROOT }}'
+  LMS_HEARTBEAT_URL: '{{ ECOMMERCE_LMS_URL_ROOT }}/heartbeat'
+  ENROLLMENT_API_URL: '{{ ECOMMERCE_LMS_URL_ROOT }}/api/enrollment/v1/enrollment'
+  LMS_DASHBOARD_URL: '{{ ECOMMERCE_LMS_URL_ROOT }}/dashboard'
+  JWT_AUTH:
+    JWT_SECRET_KEY: '{{ ECOMMERCE_JWT_SECRET_KEY }}'
+  SOCIAL_AUTH_EDX_OIDC_KEY: '{{ ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_KEY }}'
+  SOCIAL_AUTH_EDX_OIDC_SECRET: '{{ ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_SECRET }}'
+  SOCIAL_AUTH_EDX_OIDC_ID_TOKEN_DECRYPTION_KEY: '{{ ECOMMERCE_SOCIAL_AUTH_EDX_OIDC_ID_TOKEN_DECRYPTION_KEY }}'
+  SOCIAL_AUTH_EDX_OIDC_URL_ROOT: '{{ ECOMMERCE_LMS_URL_ROOT }}/oauth2'
+  
   STATIC_ROOT: "{{ COMMON_DATA_DIR }}/{{ ecommerce_service_name }}/staticfiles"
   # db config
   DATABASE_OPTIONS:
@@ -117,6 +124,7 @@ ecommerce_log_dir: "{{ COMMON_LOG_DIR }}/{{ ecommerce_service_name }}"
 ecommerce_requirements_base: "{{ ecommerce_code_dir }}/requirements"
 ecommerce_requirements:
   - production.txt
+  - optional.txt
 
 ecommerce_dev_requirements:
   - local.txt

playbooks/roles/ecommerce/tasks/main.yml

@@ -58,9 +58,12 @@
 - name: run collectstatic
   shell: >
     chdir={{ ecommerce_code_dir }}
-    {{ ecommerce_home }}/venvs/{{ ecommerce_service_name }}/bin/python manage.py collectstatic  --noinput
+    {{ ecommerce_home }}/venvs/{{ ecommerce_service_name }}/bin/python manage.py {{ item }}
   sudo_user: "{{ ecommerce_user }}"
   environment: "{{ ecommerce_environment }}"
+  with_items:
+    - "collectstatic --noinput"
+    - "compress"
 
 - name: write out the supervisor wrapper
   template: >

playbooks/roles/ecommerce/templates/edx/app/ecommerce/ecommerce.sh.j2

 #!/usr/bin/env bash
 
-{{ ansible_managed }}
+# {{ ansible_managed }}
 
 {% set ecommerce_venv_bin = ecommerce_home + "/venvs/" + ecommerce_service_name + "/bin" %}
 {% if COMMON_ENABLE_NEWRELIC_APP %}