External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-28 08:18:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #573 from wenottingham/going-up-for-some-headers

Browse Source 
Preformatted text doesn't actually work in our popovers; don't try to use it.
This commit is contained in:
Bill Nottingham
2017-11-03 15:23:05 -04:00
committed by GitHub
parent 8666512d99 19d093f7aa
commit 632ff959ff
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/main/conf.py
View File

@@ -70,14 +70,9 @@ register(
label=_('Remote Host Headers'), label=_('Remote Host Headers'),
help_text=_('HTTP headers and meta keys to search to determine remote host ' help_text=_('HTTP headers and meta keys to search to determine remote host '
'name or IP. Add additional items to this list, such as ' 'name or IP. Add additional items to this list, such as '
'"HTTP_X_FORWARDED_FOR", if behind a reverse proxy.\n\n' '"HTTP_X_FORWARDED_FOR", if behind a reverse proxy. '
'Note: The headers will be searched in order and the first ' 'See the "Proxy Support" section of the Adminstrator guide for'
'found remote host name or IP will be used.\n\n' 'more details.'),
'In the below example 8.8.8.7 would be the chosen IP address.\n'
'X-Forwarded-For: 8.8.8.7, 192.168.2.1, 127.0.0.1\n'
'Host: 127.0.0.1\n'
'REMOTE_HOST_HEADERS = [\'HTTP_X_FORWARDED_FOR\', '
'\'REMOTE_ADDR\', \'REMOTE_HOST\']'),
category=_('System'), category=_('System'),
category_slug='system', category_slug='system',
) )
@@ -88,9 +83,7 @@ register(
label=_('Proxy IP Whitelist'), label=_('Proxy IP Whitelist'),
help_text=_("If Tower is behind a reverse proxy/load balancer, use this setting " help_text=_("If Tower is behind a reverse proxy/load balancer, use this setting "
"to whitelist the proxy IP addresses from which Tower should trust " "to whitelist the proxy IP addresses from which Tower should trust "
"custom REMOTE_HOST_HEADERS header values\n" "custom REMOTE_HOST_HEADERS header values. "
"REMOTE_HOST_HEADERS = ['HTTP_X_FORWARDED_FOR', ''REMOTE_ADDR', 'REMOTE_HOST']\n"
"PROXY_IP_WHITELIST = ['10.0.1.100', '10.0.1.101']\n"
"If this setting is an empty list (the default), the headers specified by " "If this setting is an empty list (the default), the headers specified by "
"REMOTE_HOST_HEADERS will be trusted unconditionally')"), "REMOTE_HOST_HEADERS will be trusted unconditionally')"),
category=_('System'), category=_('System'),