From 9129d11e0645175fc5070f02efa507f1b7254674 Mon Sep 17 00:00:00 2001 From: git-hyagi <45576767+git-hyagi@users.noreply.github.com> Date: Mon, 6 Jan 2025 12:41:42 -0300 Subject: [PATCH] Update formatting in the `settings.md` file --- docs/admin/reference/settings.md | 12 +++++++----- template_config.yml | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/admin/reference/settings.md b/docs/admin/reference/settings.md index a706800c77..93d7564861 100644 --- a/docs/admin/reference/settings.md +++ b/docs/admin/reference/settings.md @@ -1,6 +1,6 @@ # Settings -There is one required settings, although specific plugins may have additional required +There is one required setting, although specific plugins may have additional required settings. - `SECRET_KEY ` @@ -196,11 +196,13 @@ this setting only applies to uploads created after the change. ### CONTENT_ORIGIN -A string containing the protocol, fqdn, and port where the content app is reachable by -users. This is used by `pulpcore` and various plugins when referring users to the content app. +A string containing the protocol, fqdn, and port where the content app is reachable by users. +This is used by `pulpcore` and various plugins when referring users to the content app. For example if the API should refer users to content at using http to pulp.example.com on port -24816, (the content default port), you would set: `http://pulp.example.com:24816`. The default is -`None`. When set to `None`, the API returns relative URLs (without the protocol, fqdn, and port). +24816, (the content default port), you would set: `https://pulp.example.com:24816`. The default is `None`. +When set to `None`, the `base_url` for Distributions is a relative path. +This means the API returns relative URLs without the protocol, fqdn, and port. + ### HIDE_GUARDED_DISTRIBUTIONS diff --git a/template_config.yml b/template_config.yml index fdc877497d..4747679d0d 100644 --- a/template_config.yml +++ b/template_config.yml @@ -58,6 +58,7 @@ pulp_settings: tmpfile_protection_time: 10 upload_protection_time: 10 pulp_settings_azure: + content_origin: null api_root_rewrite_header: X-API-Root domain_enabled: true rest_framework__default_permission_classes: