Merge pull request #113 from hzi-braunschweig/integration

Release 2.11.0
SORMAS-Foundation · Oct 5, 2020 · 30f827b · 30f827b
2 parents 0dcb549 + 2e6a02e
commit 30f827b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/.env b/.env
@@ -1,8 +1,8 @@
 SORMAS_POSTGRES_PASSWORD=password
 
 SORMAS_POSTGRES_USER=sormas_user
-SORMAS_DOCKER_VERSION=2.10.1
-SORMAS_VERSION=1.48.1
+SORMAS_DOCKER_VERSION=2.11.0
+SORMAS_VERSION=1.49.1
 SORMAS_SERVER_URL=sormas-docker-test.com
 SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
 
@@ -48,3 +48,10 @@ CUSTOMBRANDING_NAME=SORMAS
 CUSTOMBRANDING_LOGO_PATH=none
 CUSTOMBRANDING_USE_LOGINSIDEBAR=true
 CUSTOMBRANDING_LOGINBACKGROUND_PATH=
+
+SORMAS2SORMAS_ENABLED=false
+SORMAS2SORMAS_KEYALIAS=
+SORMAS2SORMAS_KEYSTORENAME=
+SORMAS2SORMAS_KEYPASSWORD=
+SORMAS2SORMAS_TRUSTSTORENAME=
+SORMAS2SORMAS_TRUSTSTOREPASSWORD=
diff --git a/apache2/Dockerfile b/apache2/Dockerfile
@@ -1,7 +1,7 @@
 FROM httpd:2.4-alpine
 ARG SORMAS_SERVER_URL
 
-ARG SORMAS_VERSION=1.48.1
+ARG SORMAS_VERSION=1.49.1
 ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
 
 

diff --git a/letsencrypt/Dockerfile b/letsencrypt/Dockerfile
@@ -4,7 +4,7 @@ FROM lsiobase/nginx:3.11
 
 ARG CERTBOT_VERSION=1.3.0
 ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
-ARG SORMAS_VERSION=1.48.1
+ARG SORMAS_VERSION=1.49.1
 
 LABEL maintainer="aptalca"
 

diff --git a/sormas/Dockerfile b/sormas/Dockerfile
@@ -13,7 +13,7 @@ ARG MAIL_FROM=sormas@localhost
 ARG JVM_MAX=4096m
 ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
 EXPOSE 6080
-ARG SORMAS_VERSION=1.48.1
+ARG SORMAS_VERSION=1.49.1
 
 ENV MAIL_FROM=root@localhost
 ENV DEBIAN_FRONTEND=noninteractive

diff --git a/sormas/start-server.sh b/sormas/start-server.sh
@@ -147,17 +147,22 @@ echo "interface.symptomjournal.authurl = ${SJ_AUTH}" >>${DOMAIN_DIR}/sormas.prop
 echo "interface.symptomjournal.clientid = ${SJ_CLIENTID}" >>${DOMAIN_DIR}/sormas.properties
 echo "interface.symptomjournal.secret = ${SJ_SECRET}" >>${DOMAIN_DIR}/sormas.properties
 fi
-echo -e "\ninterface.patientdiary.url = ${PD_URL}" >>${DOMAIN_DIR}/sormas.properties
+if [ ! -z "$PD_URL" ];then
+echo -e "\ninterface.patientdiary.url=${PD_URL}" >>${DOMAIN_DIR}/sormas.properties
+fi
 if [ ! -z "$CUSTOMBRANDING_ENABLED" ];then
 sed -i "s/\#custombranding=false/custombranding=${CUSTOMBRANDING_ENABLED}/" ${DOMAIN_DIR}/sormas.properties
 sed -i "s/\#custombranding.name=.*/custombranding.name=${CUSTOMBRANDING_NAME}/" ${DOMAIN_DIR}/sormas.properties
 echo -e "\ncustombranding.logo.path=${CUSTOMBRANDING_LOGO_PATH}" >>${DOMAIN_DIR}/sormas.properties
-sed -i "s/\#custombranding.useloginsidebar=.*/custombranding.useloginsidebar=${CUSTOMBRANDING_USE_LOGINSIDEBAR}" >>${DOMAIN_DIR}/sormas.properties
+echo -e "\ncustombranding.useloginsidebar=${CUSTOMBRANDING_USE_LOGINSIDEBAR}" >>${DOMAIN_DIR}/sormas.properties
 echo -e "\ncustombranding.loginbackground.path=${CUSTOMBRANDING_LOGINBACKGROUND_PATH}" >>${DOMAIN_DIR}/sormas.properties
 fi
 if [ ! -z "$SORMAS2SORMAS_ENABLED" ];then
-echo -e "\nsormas2sormas.keyAlias = ${SORMAS2SORMAS_KEYALIAS}" >>${DOMAIN_DIR}/sormas.properties
-echo -e "\nsormas2sormas.keyPassword = ${SORMAS2SORMAS_KEYPASSWORD}" >>${DOMAIN_DIR}/sormas.properties
+echo -e "\nsormas2sormas.keyAlias=${SORMAS2SORMAS_KEYALIAS}" >>${DOMAIN_DIR}/sormas.properties
+echo -e "\nsormas2sormas.keystoreName=${SORMAS2SORMAS_KEYSTORENAME}" >>${DOMAIN_DIR}/sormas.properties
+echo -e "\nsormas2sormas.keystorePass=${SORMAS2SORMAS_KEYPASSWORD}" >>${DOMAIN_DIR}/sormas.properties
+echo -e "\nsormas2sormas.truststoreName=${SORMAS2SORMAS_TRUSTSTORENAME}" >>${DOMAIN_DIR}/sormas.properties
+echo -e "\nsormas2sormas.truststorePass=${SORMAS2SORMAS_TRUSTSTOREPASSWORD}" >>${DOMAIN_DIR}/sormas.properties
 fi