From c5b6f5f9b4852d9fe877c3204cef0b79a11f766a Mon Sep 17 00:00:00 2001
From: Dennis Kliban <dkliban@redhat.com>
Date: Mon, 16 Dec 2024 16:10:17 -0500
Subject: [PATCH] Makes CONTENT_ORIGIN not a required setting

---
 CHANGES/5931.feature     |  1 +
 pulpcore/app/checks.py   | 14 --------------
 pulpcore/app/settings.py |  2 +-
 3 files changed, 2 insertions(+), 15 deletions(-)
 create mode 100644 CHANGES/5931.feature

diff --git a/CHANGES/5931.feature b/CHANGES/5931.feature
new file mode 100644
index 0000000000..755129d8d0
--- /dev/null
+++ b/CHANGES/5931.feature
@@ -0,0 +1 @@
+Allow CONTENT_ORIGIN to be None. When None, the base_url for Distributions is a relative path. 
diff --git a/pulpcore/app/checks.py b/pulpcore/app/checks.py
index a0129bf56b..74dc3d6cc7 100644
--- a/pulpcore/app/checks.py
+++ b/pulpcore/app/checks.py
@@ -4,20 +4,6 @@
 from django.core.checks import Error as CheckError, Warning as CheckWarning, register
 
 
-@register(deploy=True)
-def content_origin_check(app_configs, **kwargs):
-    messages = []
-    if getattr(settings, "CONTENT_ORIGIN", "UNREACHABLE") == "UNREACHABLE":
-        messages.append(
-            CheckError(
-                "CONTENT_ORIGIN is a required setting but it was not configured. This may be "
-                "caused by invalid read permissions of the settings file. Note that "
-                "CONTENT_ORIGIN is set by the installation automatically.",
-                id="pulpcore.E001",
-            )
-        )
-    return messages
-
 
 @register(deploy=True)
 def secret_key_check(app_configs, **kwargs):
diff --git a/pulpcore/app/settings.py b/pulpcore/app/settings.py
index ac42609145..d198602b10 100644
--- a/pulpcore/app/settings.py
+++ b/pulpcore/app/settings.py
@@ -263,7 +263,7 @@
 DRF_ACCESS_POLICY = {"reusable_conditions": ["pulpcore.app.global_access_conditions"]}
 
 # This is a sentinal value for deploy checks, since we don't want to set a default one.
-CONTENT_ORIGIN = "UNREACHABLE"
+CONTENT_ORIGIN = None
 CONTENT_PATH_PREFIX = "/pulp/content/"
 
 API_APP_TTL = 120  # The heartbeat is called from gunicorn notify (defaulting to 45 sec).