opendev/gerrit
Code Issues Proposed changes

Merge "Allow to pass run options to daemon with gerrit.sh"

Browse Source
This commit is contained in:
Saša Živkov
2014-12-11 15:30:24 +00:00
committed by Gerrit Code Review
parent bea45eac9a 6710f0a139
commit a4aafd9182
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/config-gerrit.txt
View File

@@ -1015,6 +1015,15 @@ configuration:
javaOptions = -Dlog4j.configuration=file:///home/gerrit/site/etc/log4j.properties
----
[[container.daemonOpt]]container.daemonOpt::
+
Additional options to pass to the daemon (e.g. '--enable-httpd'). If
multiple values are configured, they are passed in that order to the command
line, separated by spaces.
+
Execute `java -jar gerrit.war daemon --help` to see all possible
options.
[[container.slave]]container.slave::
+
Used on Gerrit slave installations. If set to true the Gerrit JVM is

5
gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/gerrit.sh
View File

@@ -326,6 +326,11 @@ RUN_ARGS="-jar $GERRIT_WAR daemon -d $GERRIT_SITE"
if test "`get_config --bool container.slave`" = "true" ; then
RUN_ARGS="$RUN_ARGS --slave"
fi
DAEMON_OPTS=`get_config --get-all container.daemonOpt`
if test -n "$DAEMON_OPTS" ; then
RUN_ARGS="$RUN_ARGS $DAEMON_OPTS"
fi
if test -n "$JAVA_OPTIONS" ; then
RUN_ARGS="$JAVA_OPTIONS $RUN_ARGS"
fi