diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2019-06-04 10:03:17 +0200 |
|---|---|---|
| committer | SonarTech <sonartech@sonarsource.com> | 2019-06-11 20:21:12 +0200 |
| commit | fa2d6975a9f78e1b9a24408fa99a075dd2e9780c (patch) | |
| tree | 02c536f73fe33d4e34bdc40b3c73e20f86ca04f2 | |
| parent | 27c36848f60610373c9edcc4f0b9ae804d5fc49e (diff) | |
| download | sonarqube-fa2d6975a9f78e1b9a24408fa99a075dd2e9780c.tar.gz sonarqube-fa2d6975a9f78e1b9a24408fa99a075dd2e9780c.zip | |
SONAR-11251 add http.nonProxyHosts to sonar.properties
| -rw-r--r-- | server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java | 2 | ||||
| -rw-r--r-- | sonar-application/src/main/assembly/conf/sonar.properties | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java index fb49854ce8d..34e6b612989 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java +++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java @@ -88,7 +88,7 @@ public class ProcessProperties { HTTPS_PROXY_PORT("https.proxyPort"), HTTP_PROXY_USER("http.proxyUser"), HTTP_PROXY_PASSWORD("http.proxyPassword"), - HTTP_NON_PROXY_HOSTS("http.nonProxyHosts"), + HTTP_NON_PROXY_HOSTS("http.nonProxyHosts", "localhost|127.*|[::1]"), HTTP_AUTH_NLM_DOMAN("http.auth.ntlm.domain"), SOCKS_PROXY_HOST("socksProxyHost"), SOCKS_PROXY_PORT("socksProxyPort"), diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index 301f1b61438..faf3e39c15f 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -309,6 +309,12 @@ #http.proxyUser= #http.proxyPassword= +# Proxy exceptions: list of hosts that can be accessed without going through the proxy +# separated by the '|' character, wildcard character '*' can be used for pattern matching +# used for HTTP and HTTPS (default none) +# (note: localhost and its literal notations (127.0.0.1, ...) are always excluded) +#http.nonProxyHosts= + #-------------------------------------------------------------------------------------------------- # LOGGING |