aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2016-07-24 21:13:17 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2016-07-24 21:13:17 +0200
commit1b0fbc7fafb246f10dc21868cfaa259a2bb393d2 (patch)
treea8d7fd387262d7c9572a56c78f93d5ffe1efe701 /sonar-application
parente0c1fda2f1c25af93ee1a73f44f3552616c63e23 (diff)
parent97fae6de6b4edb242575ee19e099597d44a79541 (diff)
downloadsonarqube-1b0fbc7fafb246f10dc21868cfaa259a2bb393d2.tar.gz
sonarqube-1b0fbc7fafb246f10dc21868cfaa259a2bb393d2.zip
Fix merge of branch-6.0
Diffstat (limited to 'sonar-application')
-rw-r--r--sonar-application/src/main/assembly/conf/sonar.properties10
1 files changed, 10 insertions, 0 deletions
diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index e2d938a2a9f..f2912583808 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -88,6 +88,10 @@
# is not enabled by default on your environment:
# http://docs.oracle.com/javase/8/docs/technotes/guides/vm/server-class.html
#
+# Startup can be long if entropy source is short of entropy. Adding
+# -Djava.security.egd=file:/dev/./urandom is an option to resolve the problem.
+# See https://wiki.apache.org/tomcat/HowTo/FasterStartUp#Entropy_Source
+#
#sonar.web.javaOpts=-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError
# Same as previous property, but allows to not repeat all other settings like -Xmx
@@ -122,6 +126,12 @@
# TCP port for incoming AJP connections. Disabled if value is -1. Disabled by default.
#sonar.ajp.port=-1
+# By default users are logged out and sessions closed when server is restarted.
+# If you prefer keeping user sessions open, a secret should be defined. Value is
+# HS256 key encoded with base64. It must be unique for each installation of SonarQube.
+# Example of command-line:
+# echo -n "type_what_you_want" | openssl dgst -sha256 -hmac "key" -binary | base64
+#sonar.auth.jwtBase64Hs256Secret=
#--------------------------------------------------------------------------------------------------
# COMPUTE ENGINE