diff --git a/bin/load_experiment_web_cli.sh b/bin/load_experiment_web_cli.sh index 97e00e5..eb629df 100755 --- a/bin/load_experiment_web_cli.sh +++ b/bin/load_experiment_web_cli.sh @@ -16,9 +16,6 @@ source $scriptDir/common_routines.sh echo "CONDA_PREFIX: $CONDA_PREFIX" -require_env_var "SOLR_HOST" -require_env_var "ZK_HOST" -require_env_var "ZK_PORT" require_env_var "BIOENTITIES" require_env_var "EXPERIMENT_FILES" require_env_var "EXPERIMENT_DESIGN_FILES" @@ -29,15 +26,6 @@ require_env_var "jdbc_password" # Either ACCESSIONS or PRIVATE_ACCESSIONS need to be provided #require_env_var "ACCESSIONS" -SOLR_PORT=$(get_port_from_hostport $SOLR_HOST) -SOLR_HOST=$(get_host_from_hostport $SOLR_HOST) - -require_env_var "SOLR_PORT" - -java_opts="-Dsolr.host=$SOLR_HOST" -java_opts="$java_opts -Dsolr.port=$SOLR_PORT" -java_opts="$java_opts -Dzk.host=$ZK_HOST" -java_opts="$java_opts -Dzk.port=$ZK_PORT" java_opts="$java_opts -Ddata.files.location=$BIOENTITIES" java_opts="$java_opts -Dexperiment.files.location=$EXPERIMENT_FILES" java_opts="$java_opts -Dexperiment.design.location=$EXPERIMENT_DESIGN_FILES" diff --git a/bin/update_experiment_web_cli.sh b/bin/update_experiment_web_cli.sh index 20320f1..293dac7 100755 --- a/bin/update_experiment_web_cli.sh +++ b/bin/update_experiment_web_cli.sh @@ -16,9 +16,6 @@ source $scriptDir/common_routines.sh echo "CONDA_PREFIX: $CONDA_PREFIX" -require_env_var "SOLR_HOST" -require_env_var "ZK_HOST" -require_env_var "ZK_PORT" require_env_var "BIOENTITIES" require_env_var "EXPERIMENT_FILES" require_env_var "EXPERIMENT_DESIGN_FILES" @@ -27,15 +24,6 @@ require_env_var "jdbc_username" require_env_var "jdbc_password" require_env_var "ACCESSIONS" -SOLR_PORT=$(get_port_from_hostport $SOLR_HOST) -SOLR_HOST=$(get_host_from_hostport $SOLR_HOST) - -require_env_var "SOLR_PORT" - -java_opts="-Dsolr.host=$SOLR_HOST" -java_opts="$java_opts -Dsolr.port=$SOLR_PORT" -java_opts="$java_opts -Dzk.host=$ZK_HOST" -java_opts="$java_opts -Dzk.port=$ZK_PORT" java_opts="$java_opts -Ddata.files.location=$BIOENTITIES" java_opts="$java_opts -Dexperiment.files.location=$EXPERIMENT_FILES" java_opts="$java_opts -Dexperiment.design.location=$EXPERIMENT_DESIGN_FILES"