Merge pull request #109 from open-craft/mtyaka/update-default-vars

Update ansible vars and enable some features.

instance/templates/instance/ansible/s3.yml

@@ -10,3 +10,7 @@ XQUEUE_AWS_ACCESS_KEY_ID: '{{ instance.s3_access_key }}'
 XQUEUE_AWS_SECRET_ACCESS_KEY: '{{ instance.s3_secret_access_key }}'
 XQUEUE_S3_BUCKET: '{{ instance.s3_bucket_name }}'
 XQUEUE_S3_PATH_PREFIX: 'xqueue'
+
+EDXAPP_GRADE_STORAGE_TYPE: 's3'
+EDXAPP_GRADE_BUCKET: '{{ instance.s3_bucket_name }}'
+EDXAPP_GRADE_ROOT_PATH: 'grades-download'

instance/templates/instance/ansible/vars.yml

@@ -1,20 +1,35 @@
 # System
 COMMON_HOSTNAME: '{{ instance.domain }}'
+COMMON_ENVIRONMENT: opencraft
+COMMON_DEPLOYMENT: '{{ instance.internal_lms_domain }}'
 
 # edxapp
 EDXAPP_PLATFORM_NAME: "{{ instance.name }}"
-EDXAPP_LMS_NGINX_PORT: 80
-EDXAPP_LMS_PREVIEW_NGINX_PORT: 80
-EDXAPP_CMS_NGINX_PORT: 80
 EDXAPP_SITE_NAME: '{{ instance.domain }}'
+EDXAPP_LMS_NGINX_PORT: 80
+EDXAPP_LMS_SSL_NGINX_PORT: 443
+EDXAPP_LMS_BASE_SCHEME: '{{ instance.protocol }}'
 EDXAPP_LMS_SITE_NAME: '{{ instance.domain }}'
 EDXAPP_LMS_BASE: '{{ instance.domain }}'
+
+EDXAPP_LMS_PREVIEW_NGINX_PORT: 80
 EDXAPP_PREVIEW_LMS_BASE: '{{ instance.lms_preview_domain }}'
 
+EDXAPP_CMS_NGINX_PORT: 80
+EDXAPP_CMS_SSL_NGINX_PORT: 443
 EDXAPP_CMS_SITE_NAME: '{{ instance.studio_domain }}'
 EDXAPP_CMS_BASE: '{{ instance.studio_domain }}'
 CMS_HOSTNAME: '{{ instance.studio_domain_nginx_regex }}'
 
+# Nginx
+{% if instance.protocol == 'https' %}
+NGINX_ENABLE_SSL: true
+NGINX_REDIRECT_TO_HTTPS: true
+{% else %}
+NGINX_ENABLE_SSL: false
+NGINX_REDIRECT_TO_HTTPS: false
+{% endif %}
+
 # Enable OpenStack settings to be able to use Swift.  These three variables are ignored in versions
 # of the configuration repo that don't have the openstack role yet, so it's safe to include them.
 EDXAPP_SETTINGS: 'openstack'
@@ -35,15 +50,15 @@ EDXAPP_DEFAULT_FEEDBACK_EMAIL: '{{ appserver.email }}'
 EDXAPP_SERVER_EMAIL: '{{ appserver.email }}'
 EDXAPP_BULK_EMAIL_DEFAULT_FROM_EMAIL: '{{ appserver.email }}'
 
-# Misc
-EDXAPP_TIME_ZONE: 'UTC'
-
 # Security updates
 COMMON_SECURITY_UPDATES: true
 SECURITY_UNATTENDED_UPGRADES: true
 SECURITY_UPDATE_ALL_PACKAGES: false
 SECURITY_UPGRADE_ON_ANSIBLE: true
 
+# OAuth
+EDXAPP_OAUTH_ENFORCE_SECURE: '{{ NGINX_REDIRECT_TO_HTTPS }}'
+
 # Repositories URLs
 edx_ansible_source_repo: '{{ appserver.configuration_source_repo_url }}'
 edx_platform_repo: '{{ appserver.edx_platform_repository_url }}'
@@ -56,20 +71,40 @@ notifier_version: '{{ appserver.openedx_release }}'
 xqueue_version: '{{ appserver.openedx_release }}'
 certs_version: '{{ appserver.openedx_release }}'
 
+# Misc
+EDXAPP_LANG: 'en_US.UTF-8'
+EDXAPP_TIME_ZONE: 'UTC'
+
+# Available as ENV_TOKENS in the django setting files.
+EDXAPP_ENV_EXTRA:
+  LANGUAGE_CODE: 'en'
+
 # Features
 EDXAPP_FEATURES:
-  USE_MICROSITES: false
+  ALLOW_ALL_ADVANCED_COMPONENTS: true
   AUTH_USE_OPENID: false
+  CERTIFICATES_ENABLED: true
+  CERTIFICATES_HTML_VIEW: true
+  ENABLE_COMBINED_LOGIN_REGISTRATION: true
   ENABLE_DISCUSSION_SERVICE: true
+  ENABLE_DJANGO_ADMIN_SITE: true
   ENABLE_INSTRUCTOR_ANALYTICS: true
   ENABLE_INSTRUCTOR_EMAIL: true
-  REQUIRE_COURSE_EMAIL_AUTH: false
+  ENABLE_OAUTH2_PROVIDER: true
   ENABLE_PEARSON_HACK_TEST: false
-  SUBDOMAIN_BRANDING: false
-  SUBDOMAIN_COURSE_LISTINGS: false
+  ENABLE_S3_GRADE_DOWNLOADS: true
+  ENABLE_THIRD_PARTY_AUTH: true
+  ENABLE_XBLOCK_VIEW_ENDPOINT: true
   PREVIEW_LMS_BASE: '{{ instance.lms_preview_domain }}'
-  ENABLE_DJANGO_ADMIN_SITE: true
-  ALLOW_ALL_ADVANCED_COMPONENTS: true
+  REQUIRE_COURSE_EMAIL_AUTH: false
+  USE_MICROSITES: false
+  # These are not part of the standard install:
+  # CUSTOM_COURSES_EDX: true
+  # ENABLE_LTI_PROVIDER: true
+  # ENABLE_PREREQUISITE_COURSES: true
+  # ENABLE_PROCTORED_EXAMS: true
+  # INDIVIDUAL_DUE_DATES: true
+  # MILESTONES_APP: true
 
 {% if github_admin_username_list %}# Users
 COMMON_USER_INFO:{% for github_username in github_admin_username_list %}
@@ -83,6 +118,4 @@ EDXAPP_WORKER_DEFAULT_STOPWAITSECS: 1200
 # Monitoring
 COMMON_ENABLE_NEWRELIC: {% if newrelic_license_key %}true{% else %}false{% endif %}
 COMMON_ENABLE_NEWRELIC_APP: {% if newrelic_license_key %}true{% else %}false{% endif %}
-COMMON_ENVIRONMENT: opencraft
-COMMON_DEPLOYMENT: '{{ instance.internal_lms_domain }}'
 NEWRELIC_LICENSE_KEY: '{{ newrelic_license_key|default:"" }}'