From f16bfac88bbe29a20a9882f2e3c5c0944b9c486f Mon Sep 17 00:00:00 2001 From: Nimisha Asthagiri Date: Mon, 8 Jan 2018 21:13:37 -0500 Subject: [PATCH] Update ace_common app to be a Django App Plugin --- openedx/core/djangoapps/ace_common/apps.py | 12 ++++++++++++ .../djangoapps/ace_common/settings/__init__.py | 0 .../core/djangoapps/ace_common/settings/aws.py | 16 ++++++++++++++++ .../djangoapps/ace_common/settings/common.py | 15 +++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 openedx/core/djangoapps/ace_common/settings/__init__.py create mode 100644 openedx/core/djangoapps/ace_common/settings/aws.py create mode 100644 openedx/core/djangoapps/ace_common/settings/common.py diff --git a/openedx/core/djangoapps/ace_common/apps.py b/openedx/core/djangoapps/ace_common/apps.py index 0527b125ea..33b1effbcb 100644 --- a/openedx/core/djangoapps/ace_common/apps.py +++ b/openedx/core/djangoapps/ace_common/apps.py @@ -4,6 +4,8 @@ Configuration for the ace_common Django app. from django.apps import AppConfig from django.utils.translation import ugettext_lazy as _ +from openedx.core.djangolib.django_plugins import ProjectType, PluginSettings, SettingsType + class AceCommonConfig(AppConfig): """ @@ -11,3 +13,13 @@ class AceCommonConfig(AppConfig): """ name = 'openedx.core.djangoapps.ace_common' verbose_name = _('ACE Common') + + plugin_app = { + PluginSettings.CONFIG: { + ProjectType.LMS: { + SettingsType.AWS: {PluginSettings.RELATIVE_PATH: u'settings.aws'}, + SettingsType.COMMON: {PluginSettings.RELATIVE_PATH: u'settings.common'}, + SettingsType.DEVSTACK: {PluginSettings.RELATIVE_PATH: u'settings.common'}, + } + } + } diff --git a/openedx/core/djangoapps/ace_common/settings/__init__.py b/openedx/core/djangoapps/ace_common/settings/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/openedx/core/djangoapps/ace_common/settings/aws.py b/openedx/core/djangoapps/ace_common/settings/aws.py new file mode 100644 index 0000000000..56f149f247 --- /dev/null +++ b/openedx/core/djangoapps/ace_common/settings/aws.py @@ -0,0 +1,16 @@ +def plugin_settings(settings): + settings.ACE_ENABLED_CHANNELS = settings.ENV_TOKENS.get('ACE_ENABLED_CHANNELS', settings.ACE_ENABLED_CHANNELS) + settings.ACE_ENABLED_POLICIES = settings.ENV_TOKENS.get('ACE_ENABLED_POLICIES', settings.ACE_ENABLED_POLICIES) + settings.ACE_CHANNEL_SAILTHRU_DEBUG = settings.ENV_TOKENS.get( + 'ACE_CHANNEL_SAILTHRU_DEBUG', settings.ACE_CHANNEL_SAILTHRU_DEBUG, + ) + settings.ACE_CHANNEL_SAILTHRU_TEMPLATE_NAME = settings.ENV_TOKENS.get( + 'ACE_CHANNEL_SAILTHRU_TEMPLATE_NAME', settings.ACE_CHANNEL_SAILTHRU_TEMPLATE_NAME, + ) + settings.ACE_CHANNEL_SAILTHRU_API_KEY = settings.AUTH_TOKENS.get( + 'ACE_CHANNEL_SAILTHRU_API_KEY', settings.ACE_CHANNEL_SAILTHRU_API_KEY, + ) + settings.ACE_CHANNEL_SAILTHRU_API_SECRET = settings.AUTH_TOKENS.get( + 'ACE_CHANNEL_SAILTHRU_API_SECRET', settings.ACE_CHANNEL_SAILTHRU_API_SECRET, + ) + settings.ACE_ROUTING_KEY = settings.ENV_TOKENS.get('ACE_ROUTING_KEY', settings.ACE_ROUTING_KEY) diff --git a/openedx/core/djangoapps/ace_common/settings/common.py b/openedx/core/djangoapps/ace_common/settings/common.py new file mode 100644 index 0000000000..c825505c2a --- /dev/null +++ b/openedx/core/djangoapps/ace_common/settings/common.py @@ -0,0 +1,15 @@ +def plugin_settings(settings): + settings.ACE_ENABLED_CHANNELS = [ + 'file_email' + ] + settings.ACE_ENABLED_POLICIES = [ + 'bulk_email_optout' + ] + settings.ACE_CHANNEL_SAILTHRU_DEBUG = True + settings.ACE_CHANNEL_SAILTHRU_TEMPLATE_NAME = 'Automated Communication Engine Email' + settings.ACE_CHANNEL_SAILTHRU_API_KEY = None + settings.ACE_CHANNEL_SAILTHRU_API_SECRET = None + + settings.ACE_ROUTING_KEY = 'edx.core.low' + + settings.FEATURES['test_django_plugin'] = True