Skip to content

Commit 95c8d81

Browse files
committed
Remove warning about ALLOWED_CONTENT_CHECKSUMS
It wouldn't even be clear what an admin reading this warning is supposed to do about it. OTOH If a plugin acts against this setting, it would be a bug and needed fixing.
1 parent 4564d31 commit 95c8d81

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

docs/admin/guides/configure-pulp/db-encryption.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ In containerized deployments, the setting can point to a properly shaped cluster
1313

1414
!!! warning
1515

16-
This key should take part in your backup strategy.
17-
Loosing it results in failures to operate Pulp.
16+
This key should be included in your backup strategy,
17+
as losing it will result in some Pulp functionality ceasing to work.
18+
This bears the potential of data loss.
1819

1920
To generate such a key with openssl, use:
2021

docs/admin/reference/settings.md

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,6 @@ Pulp defines the following settings itself:
126126

127127
### ALLOWED\_CONTENT\_CHECKSUMS
128128

129-
!!! warning
130-
Enforcement of this setting in `pulpcore` and various plugins is not fully in place.
131-
It is possible that checksums not in this list may still be used in various places.
132-
This banner will be removed when it is believed all `pulpcore` and plugin code fully enforces this setting.
133-
134129
The list of content-checksums this pulp-instance is **allowed to use**.
135130
By default, the following are used:
136131

@@ -252,10 +247,11 @@ Defaults to `30` seconds.
252247

253248
### CONTENT\_ORIGIN
254249

255-
A string containing the protocol, fqdn, and port where the content app is reachable by users.
250+
A string containing the `protocol`, `fqdn`, and optionally `port` where the content app is reachable by users.
256251
This is used by `pulpcore` and various plugins when referring users to the content app.
257-
For example if the API should refer users to content at using http to pulp.example.com on port 24816,
258-
(the content default port), you would set: `https://pulp.example.com:24816`.
252+
For example if the API should redirect users to content at pulp.example.com using HTTPS,
253+
you would set: `https://pulp.example.com` (not including `/pulp/content`, the `CONTENT_PATH_PREFIX`).
254+
Usually this should point to the external address of the reverse proxy.
259255
When set to `None`, the `base_url` for Distributions is a relative path.
260256
This means the API returns relative URLs without the protocol, fqdn, and port.
261257

@@ -264,7 +260,7 @@ Default to `None`.
264260
### CONTENT\_PATH\_PREFIX
265261

266262
A string containing the path prefix for the content app.
267-
This is used by the REST API when forming URLs to refer clients to the content serving app,
263+
This is used by the REST API when forming URLs to redirect clients to the content serving app,
268264
and by the content serving application to match incoming URLs.
269265

270266
Defaults to `/pulp/content/`.
@@ -393,7 +389,7 @@ Defaults to `/var/lib/pulp/tmp/`.
393389

394390
## Redis Settings
395391

396-
!!! warning
392+
!!! note
397393
To enable usage of Redis the [CACHE\_ENABLED](#cache_enabled) option must be set to `True`.
398394

399395
Below are some common settings used for Redis configuration.

0 commit comments

Comments
 (0)