diff --git a/Dockerfile b/Dockerfile index 67cb59d..c07559d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ COPY module-core/target/vocabulary-server-core.jar /opt/digiverso/vocabulary/ COPY module-core/src/main/resources/application.properties /opt/digiverso/vocabulary/ RUN sed -re "s|^(server.port=).*|\1${VOCABULARY_SERVER_PORT}|" \ -e "s|^#?(security.token=).*|\1${VOCABULARY_SERVER_TOKEN}|" \ + -e "s|^#?(server.forward-headers-strategy.*)|\1|" \ -e "s|^(spring.datasource.username=).*|\1${VOCABULARY_DB_USER}|" \ -e "s|^(spring.datasource.password=).*|\1${VOCABULARY_DB_PASSWORD}|" \ -e "s|^(spring.datasource.url=).*|\1jdbc:mariadb://$VOCABULARY_DB_SERVER:3306/${VOCABULARY_DB_DATABASE}|" \ diff --git a/module-core/pom.xml b/module-core/pom.xml index accb4e8..d779cf4 100644 --- a/module-core/pom.xml +++ b/module-core/pom.xml @@ -5,12 +5,12 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.5 io.goobi.vocabulary vocabulary-server-core - 1.1.9 + 1.1.10 Vocabulary-Server-Core Spring Boot based RESTful web service for vocabulary management jar @@ -35,7 +35,7 @@ io.goobi.vocabulary vocabulary-server-exchange - 1.1.9 + 1.1.10 compile diff --git a/module-core/src/main/resources/application.properties b/module-core/src/main/resources/application.properties index d368c74..42a423d 100644 --- a/module-core/src/main/resources/application.properties +++ b/module-core/src/main/resources/application.properties @@ -10,6 +10,12 @@ # Control anonymous read operations. If set to false or not set, anonymous readers will not get access #security.anonymous.read-allowed=true +# Proxy / Gateway configuration +# If the vocabulary server is behind a proxy, it will possibly generate wrong URLs because it is called with an internal +# IP or hostname. This can be controlled by X-Forwarded-* Headers (e. g. X-Forwarded-Host: example.com). To enable this, +# uncomment the following line. +#server.forward-headers-strategy=framework + # Basic configuration # The port the vocabulary server should listen on server.port=8081 diff --git a/module-exchange/pom.xml b/module-exchange/pom.xml index 0b5c0cb..7ca1a99 100644 --- a/module-exchange/pom.xml +++ b/module-exchange/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.goobi.vocabulary vocabulary-server-exchange - 1.1.9 + 1.1.10 Vocabulary Exchange Vocabulary data exchange classes jar @@ -34,7 +34,7 @@ com.fasterxml.jackson.dataformat jackson-dataformat-xml - 2.15.4 + 2.17.0 compile diff --git a/pom.xml b/pom.xml index 4cafdf6..ad2b989 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 io.goobi.vocabulary vocabulary-server - 1.1.9 + 1.1.10 Vocabulary-Server pom RESTful webservice for vocabulary management