aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application/src
diff options
context:
space:
mode:
authorsimonbrandhof <simon.brandhof@gmail.com>2010-11-09 14:36:57 +0000
committersimonbrandhof <simon.brandhof@gmail.com>2010-11-09 14:36:57 +0000
commitf24c8ebe314d5278287558577aafb790fea98bd4 (patch)
tree8ddbf6acf4342adc29e9b3e0b77993e0b1f4ceea /sonar-application/src
parentb064bef048b04fc3b5d6ca4dfe6311bf90230836 (diff)
downloadsonarqube-f24c8ebe314d5278287558577aafb790fea98bd4.tar.gz
sonarqube-f24c8ebe314d5278287558577aafb790fea98bd4.zip
SONAR-1943 Add proxy authentication support for update center
Diffstat (limited to 'sonar-application/src')
-rw-r--r--sonar-application/src/main/assembly/conf/sonar.properties21
1 files changed, 16 insertions, 5 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index 8702cdb73a7..6aeedbba695 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -112,9 +112,20 @@ sonar.jdbc.timeBetweenEvictionRunsMillis: 30000
#---------------------------------------------------------
# The Update Center requires an internet connection to request http://update.sonarsource.org
-# If needed, HTTP proxy can be configured with standard Java environment variables : -Dhttp.proxyHost
-# and -Dhttp.proxyPort. System configuration can also be used with -Djava.net.useSystemProxies=true.
-# These properties can not be set in this file.
-
-# Update Center is activated by default.
+# It is activated by default:
#sonar.updatecenter.activate=true
+
+# HTTP proxy (default none)
+#http.proxyHost=
+#http.proxyPort=
+
+# NT domain name if NTLM proxy is used
+#http.auth.ntlm.domain=
+
+# SOCKS proxy (default none)
+#socksProxyHost=
+#socksProxyPort=
+
+# proxy authentication. The 2 following properties are used for HTTP and SOCKS proxies.
+#http.proxyUser=
+#http.proxyPassword= \ No newline at end of file