External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-10 15:32:07 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11675 from AlexSCorey/11630-WrongtooltipDocs

Browse Source 
Fix tooltip documentation in settings
This commit is contained in:
Alex Corey 2022-02-04 10:23:11 -05:00 committed by GitHub
commit 72f440acf5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/conf.py
View File

@ -72,8 +72,8 @@ register(
'HTTP headers and meta keys to search to determine remote host '
'name or IP. Add additional items to this list, such as '
'"HTTP_X_FORWARDED_FOR", if behind a reverse proxy. '
'See the "Proxy Support" section of the Adminstrator guide for '
'more details.'
'See the "Proxy Support" section of the AAP Installation guide '
'for more details.'
),
category=_('System'),
category_slug='system',

2
awx/settings/defaults.py
View File

@ -162,7 +162,7 @@ ALLOWED_HOSTS = []
# reverse proxy.
REMOTE_HOST_HEADERS = ['REMOTE_ADDR', 'REMOTE_HOST']
# If we is behind a reverse proxy/load balancer, use this setting to
# If we are behind a reverse proxy/load balancer, use this setting to
# allow the proxy IP addresses from which Tower should trust custom
# REMOTE_HOST_HEADERS header values
# REMOTE_HOST_HEADERS = ['HTTP_X_FORWARDED_FOR', ''REMOTE_ADDR', 'REMOTE_HOST']

1
awx/ui/src/screens/Setting/MiscSystem/MiscSystemDetail/MiscSystemDetail.js
View File

@ -41,7 +41,6 @@ function MiscSystemDetail() {
);
data.DEFAULT_EXECUTION_ENVIRONMENT = name;
}
const systemData = pluck(
data,
'ACTIVITY_STREAM_ENABLED',

2
awx/ui/src/screens/Setting/shared/data.allSettingOptions.json
View File

@ -51,7 +51,7 @@
"type": "list",
"required": true,
"label": "Remote Host Headers",
"help_text": "HTTP headers and meta keys to search to determine remote host name or IP. Add additional items to this list, such as \"HTTP_X_FORWARDED_FOR\", if behind a reverse proxy. See the \"Proxy Support\" section of the Adminstrator guide for more details.",
"help_text": "HTTP headers and meta keys to search to determine remote host name or IP. Add additional items to this list, such as \"HTTP_X_FORWARDED_FOR\", if behind a reverse proxy. See the \"Proxy Support\" section of the AAP Installation guide for more details.",
"category": "System",
"category_slug": "system",
"default": ["REMOTE_ADDR", "REMOTE_HOST"],