From 155a0e89355a024877b3f256136a2d380e658ee8 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Tue, 4 Sep 2018 09:37:04 +0200
Subject: [PATCH] config fixes

---
 .../configuration/application.properties.sh               | 4 ++--
 .../configuration/eidasmiddleware.properties.sh           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh
index f54b8a08..56820c24 100755
--- a/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh
+++ b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh
@@ -1,4 +1,4 @@
-cat<<EOF>/etc/eidas-middleware/configuration/application.properties
+cat<<EOF
 logging.file=
 poseidas.admin.hashed.password=${POSEIDAS_ADMIN_HASHED_PASSWORD}
 poseidas.admin.username=${POSEIDAS_ADMIN_USERNAME:-demw}
@@ -9,6 +9,6 @@ server.ssl.key-store-password=dummy
 server.ssl.keyAlias=demw
 server.ssl.keyStoreType=PKCS12
 spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
-spring.datasource.url=jdbc\:h2\:file\:/etc/eidas-middleware/database/eidasmw;DB_CLOSE_DELAY\=-1;DB_CLOSE_ON_EXIT\=FALSE
+spring.datasource.url=jdbc\:h2\:file\:/opt/eidas-middleware/database/eidasmw;DB_CLOSE_DELAY\=-1;DB_CLOSE_ON_EXIT\=FALSE
 spring.datasource.username=${SPRING_DATASOURCE_USERNAME:-demw}
 EOF
diff --git a/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
index e6605d93..1a445904 100755
--- a/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
+++ b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
@@ -8,15 +8,15 @@ COUNTRYCODE=SE
 ENTITYID_INT=se-de-middleware
 SERVER_URL=${SERVER_URL}
 MIDDLEWARE_CRYPT_ALIAS=${MIDDLEWARE_CRYPT_ALIAS:-demw}
-MIDDLEWARE_CRYPT_KEY=/etc/eidas-middleware/configuration/eidasmw-crypto-keystore.jks
+MIDDLEWARE_CRYPT_KEY=/opt/eidas-middleware/configuration/eidasmw-crypto-keystore.jks
 MIDDLEWARE_CRYPT_PIN=${MIDDLEWARE_CRYPT_PIN}
 MIDDLEWARE_SIGN_ALIAS=${MIDDLEWARE_SIGN_ALIAS:-demw}
-MIDDLEWARE_SIGN_KEY=/etc/eidas-middleware/configuration/eidasmw-signature-keystore.jks
+MIDDLEWARE_SIGN_KEY=/opt/eidas-middleware/configuration/eidasmw-signature-keystore.jks
 MIDDLEWARE_SIGN_PIN=${MIDDLEWARE_SIGN_PIN}
 ORGANIZATION_DISPLAY_NAME=Swedish E-Identification Board
 ORGANIZATION_LANG=sv
 ORGANIZATION_NAME=Swedish E-Identification Board
 ORGANIZATION_URL=https\://elegnamnden.se
-SERVICE_PROVIDER_CONFIG_FOLDER=/etc/eidas-middleware/configuration/serviceprovider-metadata
-SERVICE_PROVIDER_METADATA_SIGNATURE_CERT=/etc/eidas-middleware/configuration/metadata-signature-certificate.crt
+SERVICE_PROVIDER_CONFIG_FOLDER=/opt/eidas-middleware/configuration/serviceprovider-metadata
+SERVICE_PROVIDER_METADATA_SIGNATURE_CERT=/opt/eidas-middleware/configuration/metadata-signature-certificate.crt
 EOF