summaryrefslogtreecommitdiffstats
path: root/sonar-application/src
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2016-03-10 23:19:01 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2016-03-11 13:50:29 +0100
commitdc41fb29beab432e573f994ee559c0f9b2b4b394 (patch)
tree097f3e4626dd5c094dac345ee1f8e820c075f163 /sonar-application/src
parent20570f275c8a996939c264bf032615554e784fc5 (diff)
downloadsonarqube-dc41fb29beab432e573f994ee559c0f9b2b4b394.tar.gz
sonarqube-dc41fb29beab432e573f994ee559c0f9b2b4b394.zip
SONAR-7429 Should be possible to specify "https.proxyHost" and "https.proxyPort" in "conf/sonar.properties"
Diffstat (limited to 'sonar-application/src')
-rw-r--r--sonar-application/src/main/assembly/conf/sonar.properties6
1 files changed, 5 insertions, 1 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index f8804f4560d..905c626599a 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -248,6 +248,10 @@
#http.proxyHost=
#http.proxyPort=
+# HTTPS proxy (default none)
+#https.proxyHost=
+#https.proxyPort=
+
# NT domain name if NTLM proxy is used
#http.auth.ntlm.domain=
@@ -255,7 +259,7 @@
#socksProxyHost=
#socksProxyPort=
-# proxy authentication. The 2 following properties are used for HTTP and SOCKS proxies.
+# Proxy authentication (used for HTTP, HTTPS and SOCKS proxies)
#http.proxyUser=
#http.proxyPassword=