diff --git a/job-server/config/dse.conf b/job-server/config/dse.conf index 3419306a9..1f9585077 100644 --- a/job-server/config/dse.conf +++ b/job-server/config/dse.conf @@ -14,12 +14,12 @@ spark { jobserver { port = 8090 - jar-store-rootdir = /tmp/jobserver/jars + jar-store-rootdir = ${HOME}/.spark-jobserver/jars jobdao = spark.jobserver.io.JobFileDAO filedao { - rootdir = /tmp/spark-job-server/filedao/data + rootdir = ${HOME}/.spark-jobserver/filedao/data } } diff --git a/job-server/config/dse.sh b/job-server/config/dse.sh index 426cd845e..afc61c6f4 100644 --- a/job-server/config/dse.sh +++ b/job-server/config/dse.sh @@ -34,8 +34,6 @@ fi DEPLOY_HOSTS="localhost" INSTALL_DIR="$DSE_COMPONENTS_ROOT/spark/spark-jobserver" -LOG_DIR=/var/log/spark/job-server +LOG_DIR="${LOG_DIR:-"$HOME/.spark-jobserver"}" PIDFILE=spark-jobserver.pid - -SPARK_CONF_DIR=${SPARK_CONF_DIR:-"$SPARK_HOME/conf"} diff --git a/job-server/src/main/resources/application.conf b/job-server/src/main/resources/application.conf index edf5bd11d..8586d66cc 100644 --- a/job-server/src/main/resources/application.conf +++ b/job-server/src/main/resources/application.conf @@ -24,13 +24,13 @@ spark { # } filedao { - rootdir = /tmp/spark-jobserver/filedao/data + rootdir = ${HOME}/.spark-jobserver/filedao/data } datadao { # storage directory for files that are uploaded to the server # via POST/data commands - rootdir = /tmp/spark-jobserver/upload + rootdir = ${HOME}/.spark-jobserver/upload } cassandra { @@ -55,12 +55,12 @@ spark { jdbc-driver = org.h2.Driver # Directory where default H2 driver stores its data. Only needed for H2. - rootdir = /tmp/spark-jobserver/sqldao/data + rootdir = ${HOME}/.spark-jobserver/sqldao/data # Full JDBC URL / init string, along with username and password. Sorry, needs to match above. # Substitutions may be used to launch job-server, but leave it out here in the default or tests won't pass jdbc { - url = "jdbc:h2:file:/tmp/spark-jobserver/sqldao/data/h2-db" + url = "jdbc:h2:file:"${HOME}"/.spark-jobserver/sqldao/data/h2-db" user = "" password = "" }