diff options
author | lpsolit%gmail.com <> | 2007-08-02 19:34:21 +0200 |
---|---|---|
committer | lpsolit%gmail.com <> | 2007-08-02 19:34:21 +0200 |
commit | 7f0c7dddde8bb8d619b3449b3fb19aabe9fea686 (patch) | |
tree | 9a2180fc1c0bf735773e498bb90871415b96bdf6 | |
parent | ff0e97c463d4cb2429f5b3a12191e4743c57eeb0 (diff) | |
download | bugzilla-7f0c7dddde8bb8d619b3449b3fb19aabe9fea686.tar.gz bugzilla-7f0c7dddde8bb8d619b3449b3fb19aabe9fea686.tar.xz |
Bug 380375: The local XML file './data/bugzilla-update.xml' cannot be created if the proxy requires authentication - Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=LpSolit
-rw-r--r-- | docs/xml/administration.xml | 9 | ||||
-rw-r--r-- | template/en/default/admin/params/core.html.tmpl | 3 | ||||
-rw-r--r-- | template/en/default/index.html.tmpl | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/docs/xml/administration.xml b/docs/xml/administration.xml index 1fe8b9d72..9c85248a5 100644 --- a/docs/xml/administration.xml +++ b/docs/xml/administration.xml @@ -1850,9 +1850,12 @@ Support: ENTRY, DEFAULT/MANDATORY, CANEDIT <literal>upgrade_notification</literal> parameter, see <xref linkend="parameters"/>. Administrators will see these notifications when they access the <filename>index.cgi</filename> - page, i.e. generally when logging in. Bugzilla will check once a - week for new releases, unless the parameter is set to - <quote>disabled</quote>. + page, i.e. generally when logging in. Bugzilla will check once per + day for new releases, unless the parameter is set to + <quote>disabled</quote>. If you are behind a proxy, you may have to set + the <literal>proxy_url</literal> parameter accordingly. If the proxy + requires authentication, use the + <literal>http://user:pass@proxy_url/</literal> syntax. </para> </section> diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl index 9ad312cfb..3fe66de27 100644 --- a/template/en/default/admin/params/core.html.tmpl +++ b/template/en/default/admin/params/core.html.tmpl @@ -92,7 +92,8 @@ proxy_url => "$terms.Bugzilla may have to access the web to get notifications about new " _ "releases, see the <tt>upgrade_notification</tt> parameter. In case you are " _ "behind a proxy, it may be necessary to enter its URL if the web server " _ - "group cannot access the HTTP_PROXY environment variable.", + "group cannot access the HTTP_PROXY environment variable. If you have to " _ + "authenticate, use the <code>http://user:pass@proxy_url/</code> syntax.", upgrade_notification => "<p>$terms.Bugzilla can inform you when a new release is available. " _ "The notification will appear on the $terms.Bugzilla homepage, " _ diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl index 132b77c74..c8448398f 100644 --- a/template/en/default/index.html.tmpl +++ b/template/en/default/index.html.tmpl @@ -80,7 +80,9 @@ function addSidebar() { <a href="editparams.cgi?section=core#upgrade_notification">notify you about new releases</a>.</p> [% ELSIF release.error == "cannot_download" %] <p>The local XML file '[% release.xml_file FILTER html %]' cannot be created. - Please make sure the web server can write in this directory.</p> + Please make sure the web server can write in this directory and that you can access + the web. If you are behind a proxy, set the + <a href="editparams.cgi?section=core#proxy_url">proxy_url</a> parameter correctly.</p> [% ELSIF release.error == "no_update" %] <p>The local XML file '[% release.xml_file FILTER html %]' cannot be updated. Please make sure the web server can edit this file.</p> |