diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh index e8bebd1f73..775fe328fa 100755 --- a/.github/workflows/scripts/install.sh +++ b/.github/workflows/scripts/install.sh @@ -119,7 +119,7 @@ if [ "$TEST" = "azure" ]; then - ./azurite:/etc/pulp\ command: "azurite-blob --blobHost 0.0.0.0"' vars/main.yaml sed -i -e '$a azure_test: true\ -pulp_scenario_settings: {"api_root_rewrite_header": "X-API-Root", "domain_enabled": true, "rest_framework__default_permission_classes": ["pulpcore.plugin.access_policy.DefaultAccessPolicy"]}\ +pulp_scenario_settings: {"api_root_rewrite_header": "X-API-Root", "content_origin": null, "domain_enabled": true, "rest_framework__default_permission_classes": ["pulpcore.plugin.access_policy.DefaultAccessPolicy"]}\ pulp_scenario_env: {}\ ' vars/main.yaml fi 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: