From 480d7875c74c3c6a5754b68e46b2f35da256208f Mon Sep 17 00:00:00 2001 From: syedimranhassan Date: Tue, 8 Oct 2019 13:39:00 +0500 Subject: [PATCH 1/2] Move cms defaults from configration repo --- cms/envs/common.py | 122 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 109 insertions(+), 13 deletions(-) diff --git a/cms/envs/common.py b/cms/envs/common.py index 2d21641ec1b1..e9e2c3edcc40 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -308,6 +308,26 @@ # Prevent auto auth from creating superusers or modifying existing users 'RESTRICT_AUTOMATIC_AUTH': True, + + 'AUTH_USE_OPENID_PROVIDER': True, + 'ENABLE_INSTRUCTOR_ANALYTICS': False, + 'PREVIEW_LMS_BASE': "preview.localhost:18000", + 'ENABLE_GRADE_DOWNLOADS': True, + 'ENABLE_MKTG_SITE': False, + # 'ENABLE_THIRD_PARTY_AUTH': True, + 'ENABLE_DISCUSSION_HOME_PANEL': True, + 'ENABLE_COMBINED_LOGIN_REGISTRATION': True, + 'ENABLE_CORS_HEADERS': False, + 'ENABLE_CROSS_DOMAIN_CSRF_COOKIE': False, + 'ENABLE_COUNTRY_ACCESS': False, + 'ENABLE_CREDIT_API': False, + 'ENABLE_OAUTH2_PROVIDER': False, + 'ENABLE_SYSADMIN_DASHBOARD': False, + 'ENABLE_MOBILE_REST_API': False, + 'CUSTOM_COURSES_EDX': False, + 'ENABLE_READING_FROM_MULTIPLE_HISTORY_TABLES': True, + 'SHOW_FOOTER_LANGUAGE_SELECTOR': False, + 'ENABLE_ENROLLMENT_RESET': False, } ENABLE_JASMINE = False @@ -319,7 +339,11 @@ ############################# SOCIAL MEDIA SHARING ############################# SOCIAL_SHARING_SETTINGS = { # Note: Ensure 'CUSTOM_COURSE_URLS' has a matching value in lms/envs/common.py - 'CUSTOM_COURSE_URLS': False + 'CUSTOM_COURSE_URLS': False, + 'DASHBOARD_FACEBOOK': False, + 'CERTIFICATE_FACEBOOK': False, + 'CERTIFICATE_TWITTER': False, + 'DASHBOARD_TWITTER': False } SOCIAL_MEDIA_FOOTER_URLS = {} @@ -349,6 +373,11 @@ DATA_DIR = COURSES_ROOT +DJFS = { + 'type': 'osfs', + 'directory_root': '/edx/var/edxapp/django-pyfs/static/django-pyfs', + 'url_root': '/static/django-pyfs', +} ######################## BRANCH.IO ########################### BRANCH_IO_KEY = '' @@ -439,6 +468,11 @@ # in the global settings.py AWS_SES_REGION_NAME = 'us-east-1' AWS_SES_REGION_ENDPOINT = 'email.us-east-1.amazonaws.com' +AWS_ACCESS_KEY_ID = None +AWS_SECRET_ACCESS_KEY = None +AWS_QUERYSTRING_AUTH = False +AWS_STORAGE_BUCKET_NAME = 'SET-ME-PLEASE (ex. bucket-name)' +AWS_S3_CUSTOM_DOMAIN = 'SET-ME-PLEASE (ex. bucket-name.s3.amazonaws.com)' ############################################################################## @@ -511,6 +545,7 @@ CROSS_DOMAIN_CSRF_COOKIE_DOMAIN = '' CROSS_DOMAIN_CSRF_COOKIE_NAME = '' +CSRF_TRUSTED_ORIGINS = [] #################### CAPA External Code Evaluation ############################# XQUEUE_INTERFACE = { @@ -602,6 +637,8 @@ 'openedx.core.djangoapps.site_configuration.middleware.SessionCookieDomainOverrideMiddleware', ] +EXTRA_MIDDLEWARE_CLASSES = [] + # Clickjacking protection can be disabled by setting this to 'ALLOW' X_FRAME_OPTIONS = 'DENY' @@ -634,7 +671,7 @@ ############################ ORA 2 ############################################ # By default, don't use a file prefix -ORA2_FILE_PREFIX = None +ORA2_FILE_PREFIX = 'default_env-default_deployment/ora2' # Default File Upload Storage bucket and prefix. Used by the FileUpload Service. FILE_UPLOAD_STORAGE_BUCKET_NAME = 'SET-ME-PLEASE (ex. bucket-name)' @@ -643,9 +680,22 @@ ############################ Modulestore Configuration ################################ DOC_STORE_CONFIG = { + 'db': 'edxapp', 'host': 'localhost', - 'db': 'xmodule', + 'replicaSet': '', + # 'password': 'password', + 'user': 'edxapp', + 'port': 27017, 'collection': 'modulestore', + 'ssl': False, + # https://api.mongodb.com/python/2.9.1/api/pymongo/mongo_client.html#module-pymongo.mongo_client + # default is never timeout while the connection is open, + #this means it needs to explicitly close raising pymongo.errors.NetworkTimeout + 'socketTimeoutMS': 3000, + 'connectTimeoutMS': 2000, # default is 20000, I believe raises pymongo.errors.ConnectionFailure + # Not setting waitQueueTimeoutMS and waitQueueMultiple since pymongo defaults to nobody being allowed to wait + 'auth_source': None, + 'read_preference': 'PRIMARY' # If 'asset_collection' defined, it'll be used # as the collection name for asset metadata. # Otherwise, a default collection name will be used. @@ -658,10 +708,11 @@ 'OPTIONS': { 'db': 'edxapp', 'host': 'localhost', - 'password': 'edxapp', + 'password': 'password', 'port': 27017, 'user': 'edxapp', - 'ssl': False + 'ssl': False, + 'auth_source': None }, 'ADDITIONAL_OPTIONS': {}, 'DOC_STORE_CONFIG': DOC_STORE_CONFIG @@ -737,7 +788,7 @@ 'OPTIONS': {}, 'PASSWORD': 'password', 'PORT': '3306', - 'USER': 'edxapp' + 'USER': 'edxapp001' } } @@ -800,7 +851,7 @@ # Email TECH_SUPPORT_EMAIL = 'technical@example.com' -EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_HOST = 'localhost' EMAIL_PORT = 25 EMAIL_USE_TLS = False @@ -835,6 +886,7 @@ # Locale/Internationalization CELERY_TIMEZONE = 'UTC' TIME_ZONE = 'UTC' +# TIME_ZONE = 'America/New_York' LANGUAGE_CODE = 'en' # http://www.i18nguy.com/unicode/language-identifiers.html LANGUAGES_BIDI = lms.envs.common.LANGUAGES_BIDI @@ -1116,6 +1168,9 @@ CELERY_BROKER_HOSTNAME = 'localhost' CELERY_BROKER_USER = 'celery' CELERY_BROKER_PASSWORD = 'celery' +CELERY_BROKER_VHOST = '' +CELERY_BROKER_USE_SSL = False +CELERY_EVENT_QUEUE_TTL = None ############################## Video ########################################## @@ -1376,6 +1431,7 @@ ############################## EVENT TRACKING ################################# +CMS_SEGMENT_KEY = None TRACK_MAX_EVENT = 50000 TRACKING_BACKENDS = { @@ -1759,7 +1815,7 @@ PARTNER_SUPPORT_EMAIL = '' # Affiliate cookie tracking -AFFILIATE_COOKIE_NAME = 'affiliate_id' +AFFILIATE_COOKIE_NAME = 'dev_affiliate_id' ############## Settings for Studio Context Sensitive Help ############## @@ -1820,7 +1876,7 @@ RECALCULATE_GRADES_ROUTING_KEY = DEFAULT_PRIORITY_QUEUE # Queue to use for updating grades due to grading policy change -POLICY_CHANGE_GRADES_ROUTING_KEY = DEFAULT_PRIORITY_QUEUE +POLICY_CHANGE_GRADES_ROUTING_KEY = 'edx.lms.core.default' # Rate limit for regrading tasks that a grading policy change can kick off POLICY_CHANGE_TASK_RATE_LIMIT = '300/h' @@ -1857,8 +1913,8 @@ ###################### ZENDESK ###################### ZENDESK_URL = '' -ZENDESK_USER = None -ZENDESK_API_KEY = None +ZENDESK_USER = '' +ZENDESK_API_KEY = '' ZENDESK_CUSTOM_FIELDS = {} ZENDESK_OAUTH_ACCESS_TOKEN = '' # A mapping of string names to Zendesk Group IDs @@ -1892,7 +1948,7 @@ ECOMMERCE_API_SIGNING_KEY = 'SET-ME-PLEASE' CREDENTIALS_INTERNAL_SERVICE_URL = 'http://localhost:8005' -CREDENTIALS_PUBLIC_SERVICE_URL = None +CREDENTIALS_PUBLIC_SERVICE_URL = 'http://localhost:8005' ANALYTICS_DASHBOARD_URL = 'http://localhost:18110/courses' ANALYTICS_DASHBOARD_NAME = 'Your Platform Name Here Insights' @@ -1994,7 +2050,7 @@ SWIFT_AUTH_URL = None SWIFT_AUTH_VERSION = None SWIFT_REGION_NAME = None -SWIFT_USE_TEMP_URLS = None +SWIFT_USE_TEMP_URLS = False SWIFT_TEMP_URL_KEY = None SWIFT_TEMP_URL_DURATION = 1800 # seconds @@ -2021,3 +2077,43 @@ # null is a language independent type in YAML 'null': {} } + +PROCTORING_SETTINGS = {} + +################## BLOCKSTORE RELATED SETTINGS ######################### +BLOCKSTORE_PUBLIC_URL_ROOT = 'http://localhost:18250' +BLOCKSTORE_API_URL = 'http://localhost:18250/api/v1' + +###################### LEARNER PORTAL ################################ +LEARNER_PORTAL_URL_ROOT = 'https://learner-portal-localhost:18000' + +######################### MICROSITE ############################### +MICROSITE_ROOT_DIR = '/edx/app/edxapp/edx-microsite' +MICROSITE_CONFIGURATION = {} + +############################ JWT ################################# +JWT_ISSUER = 'http://127.0.0.1:8000/oauth2' +DEFAULT_JWT_ISSUER = { + 'ISSUER': 'http://127.0.0.1:8000/oauth2', + 'AUDIENCE': 'SET-ME-PLEASE', + 'SECRET_KEY': 'SET-ME-PLEASE' +} +JWT_EXPIRATION = 30 +JWT_PRIVATE_SIGNING_KEY = None + + +SYSLOG_SERVER = '' +FEEDBACK_SUBMISSION_EMAIL = '' +REGISTRATION_EXTRA_FIELDS = { + 'confirm_email': 'hidden', + 'level_of_education': 'optional', + 'gender': 'optional', + 'year_of_birth': 'optional', + 'mailing_address': 'optional', + 'goals': 'optional', + 'honor_code': 'required', + 'terms_of_service': 'hidden', + 'city': 'hidden', + 'country': 'hidden', +} +EDXAPP_PARSE_KEYS = {} From 559e280beea5357d23c90d91414b8d583482ea41 Mon Sep 17 00:00:00 2001 From: syedimranhassan Date: Thu, 17 Oct 2019 12:28:35 +0500 Subject: [PATCH 2/2] Move cms defaults from configration repo --- cms/envs/common.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/cms/envs/common.py b/cms/envs/common.py index e9e2c3edcc40..96594e01c9f8 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -314,7 +314,6 @@ 'PREVIEW_LMS_BASE': "preview.localhost:18000", 'ENABLE_GRADE_DOWNLOADS': True, 'ENABLE_MKTG_SITE': False, - # 'ENABLE_THIRD_PARTY_AUTH': True, 'ENABLE_DISCUSSION_HOME_PANEL': True, 'ENABLE_COMBINED_LOGIN_REGISTRATION': True, 'ENABLE_CORS_HEADERS': False, @@ -683,7 +682,6 @@ 'db': 'edxapp', 'host': 'localhost', 'replicaSet': '', - # 'password': 'password', 'user': 'edxapp', 'port': 27017, 'collection': 'modulestore', @@ -886,7 +884,6 @@ # Locale/Internationalization CELERY_TIMEZONE = 'UTC' TIME_ZONE = 'UTC' -# TIME_ZONE = 'America/New_York' LANGUAGE_CODE = 'en' # http://www.i18nguy.com/unicode/language-identifiers.html LANGUAGES_BIDI = lms.envs.common.LANGUAGES_BIDI