diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-03-22 21:38:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 21:38:01 +0300 |
| commit | 6675f9b403b39949526e1fcce306e4adb32574b3 (patch) | |
| tree | 4afc3140fef9b57a2aaeada95c5e37e5b593f214 /config | |
| parent | ea6601a2fc781175cf271f707e486f2fb3da5d57 (diff) | |
| parent | 98d6415264c1f211f50ee7a0b336103a488c3608 (diff) | |
Merge pull request #17684 from mlatief/support-no-proxy
Add support for GuzzleHTTP 'no' proxy
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.sample.php | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 3951ef8db3c..3dc16870675 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -524,6 +524,12 @@ $CONFIG = array( /** * The URL of your proxy server, for example ``proxy.example.com:8081``. * + * Note: Guzzle (the http library used by Nextcloud) is reading the environment + * variables HTTP_PROXY (only for cli request), HTTPS_PROXY, and NO_PROXY by default. + * + * If you configure proxy with Nextcloud any default configuration by Guzzle + * is overwritten. Make sure to set ``proxyexclude`` accordingly if necessary. + * * Defaults to ``''`` (empty string) */ 'proxy' => '', @@ -536,6 +542,16 @@ $CONFIG = array( */ 'proxyuserpwd' => '', +/** + * List of host names that should not be proxied to. + * For example: ``['.mit.edu', 'foo.com']``. + * + * Hint: Use something like ``explode(',', getenv('NO_PROXY'))`` to sync this + * value with the global NO_PROXY option. + * + * Defaults to empty array. + */ +'proxyexclude' => [], /** * Deleted Items (trash bin) |