Merge pull request #518 from tdrwenski/fix-docs

oxelson · web-flow · commit 45cd6123cf53 · 2024-07-26T14:09:05.000-06:00
Fix JVM option path in documentation
diff --git a/docs/adminguide/src/site/pages/installation_upgrade/JVMSettings.md b/docs/adminguide/src/site/pages/installation_upgrade/JVMSettings.md
@@ -41,7 +41,8 @@ export JAVA_HOME="/usr/local/jdk"
 # THIS IS CRITICAL and there is NO DEFAULT - 
 # the TDS will not start without this.
 #
-CONTENT_ROOT=-Dtds.content.root.path=/data/content
+CONTENT_ROOT=/data/content
+CONTENT_ROOT_OPT=-Dtds.content.root.path=$CONTENT_ROOT
 
 # Set java prefs related variables (used by the wms service)
 JAVA_PREFS_ROOTS="-Djava.util.prefs.systemRoot=$CONTENT_ROOT/thredds/javaUtilPrefs \
@@ -57,7 +58,7 @@ HEADLESS="-Djava.awt.headless=true"
 #
 # Standard setup.
 #
-JAVA_OPTS="$CONTENT_ROOT $NORMAL $HEAP_DUMP $HEADLESS $JAVA_PREFS_ROOTS"
+JAVA_OPTS="$CONTENT_ROOT_OPT $NORMAL $HEAP_DUMP $HEADLESS $JAVA_PREFS_ROOTS"
 
 export JAVA_OPTS
 ~~~

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@ export JAVA_HOME="/usr/local/jdk"`
`41`	`41`	`# THIS IS CRITICAL and there is NO DEFAULT -`
`42`	`42`	`# the TDS will not start without this.`
`43`	`43`	`#`
`44`		`-CONTENT_ROOT=-Dtds.content.root.path=/data/content`
	`44`	`+CONTENT_ROOT=/data/content`
	`45`	`+CONTENT_ROOT_OPT=-Dtds.content.root.path=$CONTENT_ROOT`
`45`	`46`
`46`	`47`	`# Set java prefs related variables (used by the wms service)`
`47`	`48`	`JAVA_PREFS_ROOTS="-Djava.util.prefs.systemRoot=$CONTENT_ROOT/thredds/javaUtilPrefs \`
`@@ -57,7 +58,7 @@ HEADLESS="-Djava.awt.headless=true"`
`57`	`58`	`#`
`58`	`59`	`# Standard setup.`
`59`	`60`	`#`
`60`		`-JAVA_OPTS="$CONTENT_ROOT $NORMAL $HEAP_DUMP $HEADLESS $JAVA_PREFS_ROOTS"`
	`61`	`+JAVA_OPTS="$CONTENT_ROOT_OPT $NORMAL $HEAP_DUMP $HEADLESS $JAVA_PREFS_ROOTS"`
`61`	`62`
`62`	`63`	`export JAVA_OPTS`
`63`	`64`	`~~~`