diff --git a/configSemTK.sh b/configSemTK.sh index c805cf759..32373e5d7 100755 --- a/configSemTK.sh +++ b/configSemTK.sh @@ -34,7 +34,7 @@ source .env # Create an environment file containing the environment variables used in services' application.properties # This file is used at service startup (via service.unit) -cat ./*Service/BOOT-INF/classes/application.properties | grep "{" | sed -e 's/^.*{\(.*\)}$/\1=${\1}/' | sort | uniq | envsubst > environment +cat ./*Service/BOOT-INF/classes/application.properties | grep "{" | sed -e 's/^.*{\(.*\)}/\1=${\1}/' | sort | uniq | envsubst > environment # Replace the js configuration files for the SemTK webapps ./configWebapps.sh "${WEBAPPS}" diff --git a/service.unit b/service.unit index 45329165f..aead4647b 100644 --- a/service.unit +++ b/service.unit @@ -1,6 +1,6 @@ [Unit] Description=${SERVICE} -After=fuseki.service virtuoso.service ontologyInfoService.service +After=configSemTK.service fuseki.service virtuoso.service ontologyInfoService.service [Service] User=${USER} diff --git a/sparqlGraphIngestionService/src/main/resources/application.properties b/sparqlGraphIngestionService/src/main/resources/application.properties index 138c47db1..99e636863 100644 --- a/sparqlGraphIngestionService/src/main/resources/application.properties +++ b/sparqlGraphIngestionService/src/main/resources/application.properties @@ -22,10 +22,9 @@ ingestion.loggingPort=${LOGGING_SERVICE_PORT} ingestion.loggingServiceLocation=${LOGGING_SERVICE_ENDPOINT} ingestion.applicationLogName=${ingestionApplicationName} ingestion.loadTrackFolder=${ingestionLoadTrackFolder} -ingestion.loadTrackAwsRegion=${ingestionLoadTrackAwsRegion} +ingestion.loadTrackAwsRegion=${ingestionLoadTrackAwsRegion} ingestion.loadTrackS3Bucket=${ingestionLoadTrackS3Bucket} - ingestion.oinfo.protocol=${ONTOLOGYINFO_SERVICE_PROTOCOL} ingestion.oinfo.server=${ONTOLOGYINFO_SERVICE_HOST} ingestion.oinfo.port=${PORT_ONTOLOGYINFO_SERVICE}