From 0ca70546018db6b4cf2640a9b6b79f312cdb33f2 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 16 Apr 2015 00:40:53 +0800 Subject: [PATCH 1/2] Update main.yml setting for x.edustack.org --- playbooks/roles/edxapp/defaults/main.yml | 104 +++++++++++------------ 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/playbooks/roles/edxapp/defaults/main.yml b/playbooks/roles/edxapp/defaults/main.yml index 29dceabb2c3..6bf566db6e1 100644 --- a/playbooks/roles/edxapp/defaults/main.yml +++ b/playbooks/roles/edxapp/defaults/main.yml @@ -23,9 +23,9 @@ EDXAPP_DJFS: directory_root: '{{ edxapp_data_dir }}/django-pyfs/static/django-pyfs' url_root : '/static/django-pyfs' -EDXAPP_LMS_BASE: "" -EDXAPP_PREVIEW_LMS_BASE: "" -EDXAPP_CMS_BASE: "" +EDXAPP_LMS_BASE: "www.edustack.org" +EDXAPP_PREVIEW_LMS_BASE: "preview.edustack.org" +EDXAPP_CMS_BASE: "studio.edustack.org" EDXAPP_LMS_GUNICORN_EXTRA: "" EDXAPP_LMS_GUNICORN_EXTRA_CONF: "" @@ -73,11 +73,11 @@ EDXAPP_LMS_ENV: 'lms.envs.aws' EDXAPP_CMS_ENV: 'cms.envs.aws' EDXAPP_EMAIL_BACKEND: 'django.core.mail.backends.smtp.EmailBackend' -EDXAPP_EMAIL_HOST: 'localhost' +EDXAPP_EMAIL_HOST: 'smtp.exmail.qq.com' EDXAPP_EMAIL_PORT: 25 EDXAPP_EMAIL_USE_TLS: False -EDXAPP_EMAIL_HOST_USER: '' -EDXAPP_EMAIL_HOST_PASSWORD: '' +EDXAPP_EMAIL_HOST_USER: '******@edustack.org' +EDXAPP_EMAIL_HOST_PASSWORD: '******' EDXAPP_LOG_LEVEL: 'INFO' @@ -92,7 +92,7 @@ EDXAPP_OEE_USER: 'lms' EDXAPP_OEE_PASSWORD: 'password' EDXAPP_ANALYTICS_API_KEY: "" -EDXAPP_PAYMENT_SUPPORT_EMAIL: "billing@example.com" +EDXAPP_PAYMENT_SUPPORT_EMAIL: "billing@edustack.org" EDXAPP_ZENDESK_USER: "" EDXAPP_ZENDESK_URL: "" EDXAPP_ZENDESK_API_KEY: "" @@ -103,7 +103,7 @@ EDXAPP_CELERY_BROKER_VHOST: "" EDXAPP_VIDEO_CDN_URLS: EXAMPLE_COUNTRY_CODE: "http://example.com/edx/video?s3_url=" -EDXAPP_PLATFORM_NAME: 'Your Platform Name Here' +EDXAPP_PLATFORM_NAME: 'eduStack edX Demo' EDXAPP_STUDIO_NAME: 'Studio' EDXAPP_STUDIO_SHORT_NAME: 'Studio' @@ -158,15 +158,15 @@ EDXAPP_FEATURES: AUTH_USE_OPENID_PROVIDER: true CERTIFICATES_ENABLED: true ENABLE_DISCUSSION_SERVICE: true - ENABLE_INSTRUCTOR_ANALYTICS: false + ENABLE_INSTRUCTOR_ANALYTICS: true SUBDOMAIN_BRANDING: false SUBDOMAIN_COURSE_LISTINGS: false PREVIEW_LMS_BASE: "{{ EDXAPP_PREVIEW_LMS_BASE }}" ENABLE_S3_GRADE_DOWNLOADS: true - USE_CUSTOM_THEME: "{{ edxapp_use_custom_theme }}" - ENABLE_MKTG_SITE: "{{ EDXAPP_ENABLE_MKTG_SITE }}" - AUTOMATIC_AUTH_FOR_TESTING: "{{ EDXAPP_ENABLE_AUTO_AUTH }}" - ENABLE_THIRD_PARTY_AUTH: "{{ EDXAPP_ENABLE_THIRD_PARTY_AUTH }}" + USE_CUSTOM_THEME: $edxapp_use_custom_theme + ENABLE_MKTG_SITE: $EDXAPP_ENABLE_MKTG_SITE + AUTOMATIC_AUTH_FOR_TESTING: $EDXAPP_ENABLE_AUTO_AUTH + ENABLE_THIRD_PARTY_AUTH: $EDXAPP_ENABLE_THIRD_PARTY_AUTH ENABLE_VIDEO_UPLOAD_PIPELINE: false ENABLE_DISCUSSION_HOME_PANEL: true ENABLE_COMBINED_LOGIN_REGISTRATION: true @@ -175,15 +175,15 @@ EDXAPP_FEATURES: ENABLE_COUNTRY_ACCESS: false ENABLE_VIDEO_BEACON: false ENABLE_ONLOAD_BEACON: false - ENABLE_EDXNOTES: "{{ EDXAPP_ENABLE_EDXNOTES }}" + ENABLE_EDXNOTES: $EDXAPP_ENABLE_EDXNOTES EDXAPP_BOOK_URL: "" # This needs to be set to localhost # if xqueue is run on the same server # as the lms (it's sent in the request) -EDXAPP_SITE_NAME: 'localhost' +EDXAPP_SITE_NAME: 'www.edustack.org' EDXAPP_LMS_SITE_NAME: "{{ EDXAPP_SITE_NAME }}" -EDXAPP_CMS_SITE_NAME: 'localhost' +EDXAPP_CMS_SITE_NAME: 'studio.edustack.org' EDXAPP_MEDIA_URL: "/media" EDXAPP_ANALYTICS_SERVER_URL: "" EDXAPP_FEEDBACK_SUBMISSION_EMAIL: "" @@ -207,28 +207,28 @@ EDXAPP_COURSE_REQUEST_RATE: '5r/s' EDXAPP_COURSE_REQUEST_BURST_RATE: 10 EDXAPP_LANG: 'en_US.UTF-8' -EDXAPP_LANGUAGE_CODE : 'en' -EDXAPP_TIME_ZONE: 'America/New_York' - -EDXAPP_TECH_SUPPORT_EMAIL: 'technical@example.com' -EDXAPP_CONTACT_EMAIL: 'info@example.com' -EDXAPP_BUGS_EMAIL: 'bugs@example.com' -EDXAPP_DEFAULT_FROM_EMAIL: 'registration@example.com' -EDXAPP_DEFAULT_FEEDBACK_EMAIL: 'feedback@example.com' -EDXAPP_DEFAULT_SERVER_EMAIL: 'devops@example.com' -EDXAPP_BULK_EMAIL_DEFAULT_FROM_EMAIL: 'no-reply@example.com' +EDXAPP_LANGUAGE_CODE : 'zh-cn' +EDXAPP_TIME_ZONE: 'Asia/Shanghai' + +EDXAPP_TECH_SUPPORT_EMAIL: 'technical@edustack.org' +EDXAPP_CONTACT_EMAIL: 'info@edustack.org' +EDXAPP_BUGS_EMAIL: 'bugs@edustack.org' +EDXAPP_DEFAULT_FROM_EMAIL: 'noreply@edustack.org' +EDXAPP_DEFAULT_FEEDBACK_EMAIL: 'feedback@edustack.org' +EDXAPP_DEFAULT_SERVER_EMAIL: 'devops@edustack.org' +EDXAPP_BULK_EMAIL_DEFAULT_FROM_EMAIL: 'noreply@edustack.org' EDXAPP_BULK_EMAIL_LOG_SENT_EMAILS: false -EDXAPP_UNIVERSITY_EMAIL: 'university@example.com' -EDXAPP_PRESS_EMAIL: 'press@example.com' +EDXAPP_UNIVERSITY_EMAIL: 'university@edustack.org' +EDXAPP_PRESS_EMAIL: 'press@edustack.org' -EDXAPP_PLATFORM_TWITTER_ACCOUNT: '@YourPlatformTwitterAccount' -EDXAPP_PLATFORM_FACEBOOK_ACCOUNT: 'http://www.facebook.com/YourPlatformFacebookAccount' +EDXAPP_PLATFORM_TWITTER_ACCOUNT: '@edustackorg' +EDXAPP_PLATFORM_FACEBOOK_ACCOUNT: 'http://www.facebook.com/edustackorg' # Deprecated by EDXAPP_SOCIAL_MEDIA_FOOTER_URLS -EDXAPP_PLATFORM_TWITTER_URL: "https://twitter.com/YourPlatformTwitterAccount" -EDXAPP_PLATFORM_MEETUP_URL: "http://www.meetup.com/YourMeetup" -EDXAPP_PLATFORM_LINKEDIN_URL: "http://www.linkedin.com/company/YourPlatform" -EDXAPP_PLATFORM_GOOGLE_PLUS_URL: "https://plus.google.com/YourGooglePlusAccount/" +EDXAPP_PLATFORM_TWITTER_URL: "https://twitter.com/edustackorg" +EDXAPP_PLATFORM_MEETUP_URL: "http://www.meetup.com/edustackorg" +EDXAPP_PLATFORM_LINKEDIN_URL: "http://www.linkedin.com/edustackorg" +EDXAPP_PLATFORM_GOOGLE_PLUS_URL: "https://plus.google.com/edustackorg/" EDXAPP_SOCIAL_MEDIA_FOOTER_URLS: {} @@ -265,7 +265,7 @@ EDXAPP_CC_PROCESSOR: PROFILE_ID: "" # does not affect verified students -EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY: ['usd', '$'] +EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY: ['cny', 'Y'] # Configure paver tasks in edx-platform to skip Python/Ruby/Node installation EDXAPP_NO_PREREQ_INSTALL: 1 @@ -561,7 +561,7 @@ edxapp_environment: GEM_PATH: "{{ edxapp_gem_root }}" PATH: "{{ edxapp_deploy_path }}" # the settings module for edxapp, DJANGO_SETTINGS_MODULE - # should be set to {{SERVICE_VARIANT}}.{{EDXAPP_SETTINGS}} + # should be set to ${SERVICE_VARIANT}.${EDXAPP_SETTINGS} # where SERVICE_VARIANT is lms or cms EDX_PLATFORM_SETTINGS: aws # Current set to the app dir for json config, this should @@ -583,7 +583,7 @@ edxapp_generic_auth_config: &edxapp_generic_auth db: "{{ EDXAPP_MONGO_DB_NAME }}" host: "{{ EDXAPP_MONGO_HOSTS }}" password: "{{ EDXAPP_MONGO_PASSWORD }}" - port: "{{ EDXAPP_MONGO_PORT }}" + port: $EDXAPP_MONGO_PORT user: "{{ EDXAPP_MONGO_USER }}" collection: 'modulestore' CONTENTSTORE: @@ -596,7 +596,7 @@ edxapp_generic_auth_config: &edxapp_generic_auth db: "{{ EDXAPP_MONGO_DB_NAME }}" host: "{{ EDXAPP_MONGO_HOSTS }}" password: "{{ EDXAPP_MONGO_PASSWORD }}" - port: "{{ EDXAPP_MONGO_PORT }}" + port: $EDXAPP_MONGO_PORT user: "{{ EDXAPP_MONGO_USER }}" ADDITIONAL_OPTIONS: "{{ EDXAPP_CONTENTSTORE_ADDITIONAL_OPTS }}" DOC_STORE_CONFIG: *edxapp_generic_default_docstore @@ -661,7 +661,7 @@ edxapp_generic_auth_config: &edxapp_generic_auth GOOGLE_ANALYTICS_ACCOUNT: "{{ EDXAPP_GOOGLE_ANALYTICS_ACCOUNT }}" THIRD_PARTY_AUTH: "{{ EDXAPP_THIRD_PARTY_AUTH }}" AWS_STORAGE_BUCKET_NAME: "{{ EDXAPP_AWS_STORAGE_BUCKET_NAME }}" - DJFS: "{{ EDXAPP_DJFS }}" + DJFS: $EDXAPP_DJFS generic_cache_config: &default_generic_cache BACKEND: 'django.core.cache.backends.memcached.MemcachedCache' @@ -671,9 +671,9 @@ generic_cache_config: &default_generic_cache generic_env_config: &edxapp_generic_env ECOMMERCE_API_URL: "{{ EDXAPP_ECOMMERCE_API_URL }}" - ONLOAD_BEACON_SAMPLE_RATE: "{{ EDXAPP_ONLOAD_BEACON_SAMPLE_RATE }}" + ONLOAD_BEACON_SAMPLE_RATE: $EDXAPP_ONLOAD_BEACON_SAMPLE_RATE CORS_ORIGIN_WHITELIST: "{{ EDXAPP_CORS_ORIGIN_WHITELIST }}" - CORS_ORIGIN_ALLOW_ALL: "{{ EDXAPP_CORS_ORIGIN_ALLOW_ALL }}" + CORS_ORIGIN_ALLOW_ALL: $EDXAPP_CORS_ORIGIN_ALLOW_ALL CROSS_DOMAIN_CSRF_COOKIE_DOMAIN: "{{ EDXAPP_CROSS_DOMAIN_CSRF_COOKIE_DOMAIN }}" CROSS_DOMAIN_CSRF_COOKIE_NAME: "{{ EDXAPP_CROSS_DOMAIN_CSRF_COOKIE_NAME }}" VIDEO_UPLOAD_PIPELINE: "{{ EDXAPP_VIDEO_UPLOAD_PIPELINE }}" @@ -687,9 +687,9 @@ generic_env_config: &edxapp_generic_env PAYMENT_SUPPORT_EMAIL: "{{ EDXAPP_PAYMENT_SUPPORT_EMAIL }}" ZENDESK_URL: "{{ EDXAPP_ZENDESK_URL }}" COURSES_WITH_UNSAFE_CODE: "{{ EDXAPP_COURSES_WITH_UNSAFE_CODE }}" - BULK_EMAIL_EMAILS_PER_TASK: "{{ EDXAPP_BULK_EMAIL_EMAILS_PER_TASK }}" + BULK_EMAIL_EMAILS_PER_TASK: $EDXAPP_BULK_EMAIL_EMAILS_PER_TASK MICROSITE_ROOT_DIR: "{{ EDXAPP_MICROSITE_ROOT_DIR }}" - MICROSITE_CONFIGURATION: "{{ EDXAPP_MICROSITE_CONFIGURATION }}" + MICROSITE_CONFIGURATION: $EDXAPP_MICROSITE_CONFIGURATION GRADES_DOWNLOAD: STORAGE_TYPE: "{{ EDXAPP_GRADE_STORAGE_TYPE }}" BUCKET: "{{ EDXAPP_GRADE_BUCKET }}" @@ -707,8 +707,8 @@ generic_env_config: &edxapp_generic_env # default email backed set to local SMTP EMAIL_BACKEND: "{{ EDXAPP_EMAIL_BACKEND }}" EMAIL_HOST: "{{ EDXAPP_EMAIL_HOST }}" - EMAIL_PORT: "{{ EDXAPP_EMAIL_PORT }}" - EMAIL_USE_TLS: "{{ EDXAPP_EMAIL_USE_TLS }}" + EMAIL_PORT: $EDXAPP_EMAIL_PORT + EMAIL_USE_TLS: $EDXAPP_EMAIL_USE_TLS FEATURES: "{{ EDXAPP_FEATURES }}" TENDER_DOMAIN: "{{ EDXAPP_TENDER_DOMAIN }}" TENDER_SUBDOMAIN: "{{ EDXAPP_TENDER_SUBDOMAIN }}" @@ -757,8 +757,8 @@ generic_env_config: &edxapp_generic_env SESSION_COOKIE_DOMAIN: "{{ EDXAPP_SESSION_COOKIE_DOMAIN }}" SESSION_COOKIE_NAME: "{{ EDXAPP_SESSION_COOKIE_NAME }}" COMMENTS_SERVICE_KEY: "{{ EDXAPP_COMMENTS_SERVICE_KEY }}" - SEGMENT_IO_LMS: "{{ EDXAPP_SEGMENT_IO_LMS }}" - SEGMENT_IO: "{{ EDXAPP_SEGMENT_IO }}" + SEGMENT_IO_LMS: $EDXAPP_SEGMENT_IO_LMS + SEGMENT_IO: $EDXAPP_SEGMENT_IO THEME_NAME: "{{ edxapp_theme_name }}" TECH_SUPPORT_EMAIL: "{{ EDXAPP_TECH_SUPPORT_EMAIL }}" CONTACT_EMAIL: "{{ EDXAPP_CONTACT_EMAIL }}" @@ -767,7 +767,7 @@ generic_env_config: &edxapp_generic_env DEFAULT_FEEDBACK_EMAIL: "{{ EDXAPP_DEFAULT_FEEDBACK_EMAIL }}" SERVER_EMAIL: "{{ EDXAPP_DEFAULT_SERVER_EMAIL }}" BULK_EMAIL_DEFAULT_FROM_EMAIL: "{{ EDXAPP_BULK_EMAIL_DEFAULT_FROM_EMAIL }}" - BULK_EMAIL_LOG_SENT_EMAILS: "{{ EDXAPP_BULK_EMAIL_LOG_SENT_EMAILS }}" + BULK_EMAIL_LOG_SENT_EMAILS: $EDXAPP_BULK_EMAIL_LOG_SENT_EMAILS CAS_SERVER_URL: "{{ EDXAPP_CAS_SERVER_URL }}" CAS_EXTRA_LOGIN_PARAMS: "{{ EDXAPP_CAS_EXTRA_LOGIN_PARAMS }}" CAS_ATTRIBUTE_CALLBACK: "{{ EDXAPP_CAS_ATTRIBUTE_CALLBACK }}" @@ -803,8 +803,8 @@ lms_auth_config: lms_env_config: <<: *edxapp_generic_env - OAUTH_ENFORCE_SECURE: "{{ EDXAPP_OAUTH_ENFORCE_SECURE }}" - PAID_COURSE_REGISTRATION_CURRENCY: "{{ EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY }}" + OAUTH_ENFORCE_SECURE: $EDXAPP_OAUTH_ENFORCE_SECURE + PAID_COURSE_REGISTRATION_CURRENCY: $EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY GIT_REPO_DIR: "{{ EDXAPP_GIT_REPO_DIR }}" SITE_NAME: "{{ EDXAPP_LMS_SITE_NAME }}" VIDEO_CDN_URL: "{{ EDXAPP_VIDEO_CDN_URLS }}" @@ -822,8 +822,8 @@ lms_env_config: PDF_RECEIPT_COBRAND_LOGO_PATH: "{{ EDXAPP_PDF_RECEIPT_COBRAND_LOGO_PATH }}" PDF_RECEIPT_LOGO_PATH: "{{ EDXAPP_PDF_RECEIPT_LOGO_PATH }}" PROFILE_IMAGE_BACKEND: "{{ EDXAPP_PROFILE_IMAGE_BACKEND }}" - PROFILE_IMAGE_MIN_BYTES: "{{ EDXAPP_PROFILE_IMAGE_MIN_BYTES }}" - PROFILE_IMAGE_MAX_BYTES: "{{ EDXAPP_PROFILE_IMAGE_MAX_BYTES }}" + PROFILE_IMAGE_MIN_BYTES: $EDXAPP_PROFILE_IMAGE_MIN_BYTES + PROFILE_IMAGE_MAX_BYTES: $EDXAPP_PROFILE_IMAGE_MAX_BYTES cms_auth_config: <<: *edxapp_generic_auth From 52b046aaf3324b69ff27df75e589437d0cfa51f5 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 16 Apr 2015 14:41:23 +0800 Subject: [PATCH 2/2] Update main.yml update EDXAPP_LMS_BASE & EDXAPP_SITE_NAME --- playbooks/roles/edxapp/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/roles/edxapp/defaults/main.yml b/playbooks/roles/edxapp/defaults/main.yml index 6bf566db6e1..55fb6ad95e1 100644 --- a/playbooks/roles/edxapp/defaults/main.yml +++ b/playbooks/roles/edxapp/defaults/main.yml @@ -23,7 +23,7 @@ EDXAPP_DJFS: directory_root: '{{ edxapp_data_dir }}/django-pyfs/static/django-pyfs' url_root : '/static/django-pyfs' -EDXAPP_LMS_BASE: "www.edustack.org" +EDXAPP_LMS_BASE: "x.edustack.org" EDXAPP_PREVIEW_LMS_BASE: "preview.edustack.org" EDXAPP_CMS_BASE: "studio.edustack.org" @@ -181,7 +181,7 @@ EDXAPP_BOOK_URL: "" # This needs to be set to localhost # if xqueue is run on the same server # as the lms (it's sent in the request) -EDXAPP_SITE_NAME: 'www.edustack.org' +EDXAPP_SITE_NAME: 'x.edustack.org' EDXAPP_LMS_SITE_NAME: "{{ EDXAPP_SITE_NAME }}" EDXAPP_CMS_SITE_NAME: 'studio.edustack.org' EDXAPP_MEDIA_URL: "/media"