Merge branch 'master' into arbab/certs-rewrite

playbooks/roles/discovery/defaults/main.yml

@@ -41,7 +41,7 @@ DISCOVERY_DATABASES:
 # Using AWS? Use the AWS-provided host (e.g. https://search-test-abc123.us-east-1.es.amazonaws.com/).
 # Assuming the port corresponds that of the protocol (e.g. http=80, https=443), there is no need to specify a port.
 DISCOVERY_ELASTICSEARCH_URL: 'http://127.0.0.1:9200/'
-DISCOVERY_ELASTICSEARCH_INDEX_NAME: 'discovery'
+DISCOVERY_ELASTICSEARCH_INDEX_NAME: 'catalog'
 
 DISCOVERY_MEMCACHE: [ 'memcache' ]
 

playbooks/roles/programs/defaults/main.yml

@@ -48,9 +48,19 @@ PROGRAMS_LANGUAGE_CODE: 'en-us'
 PROGRAMS_SOCIAL_AUTH_EDX_OIDC_KEY : 'programs-key'
 PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET : 'programs-secret'
 PROGRAMS_SOCIAL_AUTH_REDIRECT_IS_HTTPS: false
-PROGRAMS_SOCIAL_AUTH_EDX_OIDC_URL_ROOT: '{{ PROGRAMS_LMS_URL_ROOT }}/oauth2'
+PROGRAMS_OAUTH_URL_ROOT: '{{ PROGRAMS_LMS_URL_ROOT }}/oauth2'
 PROGRAMS_SOCIAL_AUTH_EDX_OIDC_LOGOUT_URL: '{{ PROGRAMS_LMS_URL_ROOT }}/logout'
 
+PROGRAMS_JWT_AUDIENCE: '{{ EDXAPP_JWT_AUDIENCE | default("SET-ME-PLEASE") }}'
+PROGRAMS_JWT_ISSUER: '{{ PROGRAMS_OAUTH_URL_ROOT }}'
+PROGRAMS_JWT_SECRET_KEY: '{{ EDXAPP_JWT_SECRET_KEY | default("lms-secret") }}'
+
+PROGRAMS_JWT_AUTH: 
+  JWT_ISSUERS:
+    - AUDIENCE: '{{ PROGRAMS_JWT_AUDIENCE }}'
+      ISSUER: '{{ PROGRAMS_JWT_ISSUER }}'
+      SECRET_KEY: '{{ PROGRAMS_JWT_SECRET_KEY }}'
+
 PROGRAMS_PLATFORM_NAME: 'Your Platform Name Here'
 
 # CORS
@@ -104,7 +114,7 @@ PROGRAMS_SERVICE_CONFIG:
   SOCIAL_AUTH_EDX_OIDC_KEY: '{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_KEY }}'
   SOCIAL_AUTH_EDX_OIDC_SECRET: '{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET }}'
   SOCIAL_AUTH_EDX_OIDC_ID_TOKEN_DECRYPTION_KEY: '{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_SECRET }}'
-  SOCIAL_AUTH_EDX_OIDC_URL_ROOT: '{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_URL_ROOT }}'
+  SOCIAL_AUTH_EDX_OIDC_URL_ROOT: '{{ PROGRAMS_OAUTH_URL_ROOT }}'
   SOCIAL_AUTH_EDX_OIDC_LOGOUT_URL: '{{ PROGRAMS_SOCIAL_AUTH_EDX_OIDC_LOGOUT_URL }}'
   SOCIAL_AUTH_REDIRECT_IS_HTTPS: '{{ PROGRAMS_SOCIAL_AUTH_REDIRECT_IS_HTTPS }}'
 
@@ -122,6 +132,8 @@ PROGRAMS_SERVICE_CONFIG:
   ORGANIZATIONS_API_URL_ROOT: '{{ PROGRAMS_ORGANIZATIONS_API_URL_ROOT }}'
   
   MEDIA_STORAGE_BACKEND: '{{ PROGRAMS_MEDIA_STORAGE_BACKEND }}'
+  
+  JWT_AUTH: '{{ PROGRAMS_JWT_AUTH }}'
 
 PROGRAMS_REPOS:
   - PROTOCOL: "{{ COMMON_GIT_PROTOCOL }}"
@@ -149,6 +161,7 @@ programs_user: "{{ programs_service_name }}"
 programs_home: "{{ COMMON_APP_DIR }}/{{ programs_service_name }}"
 programs_code_dir: "{{ programs_home }}/{{ programs_service_name }}"
 
+programs_node_version: "4.4.7"
 programs_nodeenv_dir: "{{ programs_home }}/nodeenvs/{{ programs_service_name }}"
 programs_nodeenv_bin: "{{ programs_nodeenv_dir }}/bin"
 programs_node_modules_dir: "{{ programs_code_dir }}/node_modules"

playbooks/roles/programs/tasks/main.yml

@@ -39,7 +39,7 @@
 - name: create nodeenv
   shell: >
     creates={{ programs_nodeenv_dir }}
-    {{ programs_venv_dir }}/bin/nodeenv {{ programs_nodeenv_dir }} --prebuilt
+    {{ programs_venv_dir }}/bin/nodeenv {{ programs_nodeenv_dir }} --node={{ programs_node_version }} --prebuilt
   become_user: "{{ programs_user }}"
 
 - name: install node dependencies