diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-03-02 06:05:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-02 06:05:28 +0100 |
| commit | 785a05910108a6d032e802605762d7567dec4123 (patch) | |
| tree | f22f76884460d1ae17e2ed9edfef77fdf643168a /template/en/default | |
| parent | b5ece2542a5416c97f3b9e060b877404349fafe6 (diff) | |
| download | bugzilla-785a05910108a6d032e802605762d7567dec4123.tar.gz bugzilla-785a05910108a6d032e802605762d7567dec4123.tar.xz | |
Bug 1442520 - move inbound_proxies to localconfig
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/admin/params/advanced.html.tmpl | 9 | ||||
| -rw-r--r-- | template/en/default/setup/strings.txt.pl | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/template/en/default/admin/params/advanced.html.tmpl b/template/en/default/admin/params/advanced.html.tmpl index 75885b3f4..92c84d703 100644 --- a/template/en/default/admin/params/advanced.html.tmpl +++ b/template/en/default/admin/params/advanced.html.tmpl @@ -54,15 +54,6 @@ [% END %] [% param_descs = { - inbound_proxies => - "When inbound traffic to $terms.Bugzilla goes through a proxy," - _ " $terms.Bugzilla thinks that the IP address of every single" - _ " user is the IP address of the proxy. If you enter a comma-separated" - _ " list of IPs in this parameter, then $terms.Bugzilla will trust any" - _ " <code>X-Forwarded-For</code> header sent from those IPs," - _ " and use the value of that header as the end user's IP address." - _ " If set to a *, $terms.Bugzilla will trust the first value in the " - _ " X-Forwarded-For header.", proxy_url => "$terms.Bugzilla may have to access the web to get notifications about" diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index ce4785b04..9de426972 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -181,6 +181,11 @@ For the "Difference Between Two Patches" feature to work, we need to know what directory the "diff" bin is in. (You only need to set this if you are using that feature of the Patch Viewer.) END + localconfig_inbound_proxies => <<'END', +This is a list of IP addresses that we expect proxies to come from. +This can be '*' if only the load balancer can connect. +Setting this to '*' means that we can trust the X-Forwarded-For header. +END localconfig_index_html => <<'END', Most web servers will allow you to use index.cgi as a directory index, and many come preconfigured that way, but if yours doesn't |