Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all references to Journals

Browse Source
This commit is contained in:
Matt Tuchfarber
2019-07-03 15:08:57 -04:00
parent a72198d915
commit 2583d317db
40 changed files with 1 additions and 1839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
openedx/core/djangoapps/theming/management/commands/create_sites_and_configurations.py
View File

@@ -38,10 +38,6 @@ class Command(BaseCommand):
discovery_user = None
discovery_base_url_fmt = None
discovery_oidc_url = None
journals = False
journals_user = None
journals_base_url_fmt = None
journals_oidc_url = None
configuration_filename = None
@@ -69,13 +65,6 @@ class Command(BaseCommand):
help="Use devstack config, otherwise sandbox config is assumed",
)
parser.add_argument(
"--enable-journals",
dest="journals",
action="store_true",
help="Enable journal configuration",
)
def _create_oauth2_client(self, url, site_name, service_name, service_user):
"""
Creates the oauth2 client and add it in trusted clients.
@@ -191,7 +180,7 @@ class Command(BaseCommand):
def get_or_create_service_user(self, username):
"""
Creates the service user for ecommerce, discovery and journals.
Creates the service user for ecommerce and discovery.
"""
service_user, _ = User.objects.get_or_create(username=username)
service_user.is_active = True
@@ -211,7 +200,6 @@ class Command(BaseCommand):
def handle(self, *args, **options):
self.dns_name = options['dns_name']
self.theme_path = options['theme_path']
self.journals = options['journals']
if options['devstack']:
configuration_prefix = "devstack"
@@ -219,22 +207,16 @@ class Command(BaseCommand):
self.discovery_base_url_fmt = "http://discovery-{site_domain}:18381/"
self.ecommerce_oidc_url = "http://ecommerce-{}.e2e.devstack:18130/complete/edx-oidc/".format(self.dns_name)
self.ecommerce_base_url_fmt = "http://ecommerce-{site_domain}:18130/"
self.journals_oidc_url = "http://journals-{}.e2e.devstack:18606/complete/edx-oidc/".format(self.dns_name)
self.journals_base_url_fmt = "http://journals-{site_domain}:18606/"
else:
configuration_prefix = "sandbox"
self.discovery_oidc_url = "https://discovery-{}.sandbox.edx.org/complete/edx-oidc/".format(self.dns_name)
self.discovery_base_url_fmt = "https://discovery-{site_domain}/"
self.ecommerce_oidc_url = "https://ecommerce-{}.sandbox.edx.org/complete/edx-oidc/".format(self.dns_name)
self.ecommerce_base_url_fmt = "https://ecommerce-{site_domain}/"
self.journals_oidc_url = "https://journals-{}.sandbox.edx.org/complete/edx-oidc/".format(self.dns_name)
self.journals_base_url_fmt = "https://journals-{site_domain}/"
self.configuration_filename = '{}_configuration.json'.format(configuration_prefix)
self.discovery_user = self.get_or_create_service_user("lms_catalog_service_user")
self.ecommerce_user = self.get_or_create_service_user("ecommerce_worker")
if self.journals:
self.journals_user = self.get_or_create_service_user("journals_worker")
all_sites = self._get_sites_data()
self._update_default_clients()
@@ -245,7 +227,6 @@ class Command(BaseCommand):
discovery_url = self.discovery_base_url_fmt.format(site_domain=site_domain)
ecommerce_url = self.ecommerce_base_url_fmt.format(site_domain=site_domain)
journals_url = self.journals_base_url_fmt.format(site_domain=site_domain)
LOG.info(u"Creating '{site_name}' Site".format(site_name=site_name))
self._create_sites(site_domain, site_data['theme_dir_name'], site_data['configuration'])
@@ -256,8 +237,4 @@ class Command(BaseCommand):
LOG.info(u"Creating ecommerce oauth2 client for '{site_name}' site".format(site_name=site_name))
self._create_oauth2_client(ecommerce_url, site_name, 'ecommerce', self.ecommerce_user)
if self.journals:
LOG.info(u"Creating journals oauth2 client for '{site_name}' site".format(site_name=site_name))
self._create_oauth2_client(journals_url, site_name, 'journals', self.journals_user)
self._enable_commerce_configuration()