config fixes

This commit is contained in:
Leif Johansson 2018-09-04 09:37:04 +02:00
parent be6a3420de
commit 155a0e8935
2 changed files with 6 additions and 6 deletions

View file

@ -1,4 +1,4 @@
cat<<EOF>/etc/eidas-middleware/configuration/application.properties cat<<EOF
logging.file= logging.file=
poseidas.admin.hashed.password=${POSEIDAS_ADMIN_HASHED_PASSWORD} poseidas.admin.hashed.password=${POSEIDAS_ADMIN_HASHED_PASSWORD}
poseidas.admin.username=${POSEIDAS_ADMIN_USERNAME:-demw} poseidas.admin.username=${POSEIDAS_ADMIN_USERNAME:-demw}
@ -9,6 +9,6 @@ server.ssl.key-store-password=dummy
server.ssl.keyAlias=demw server.ssl.keyAlias=demw
server.ssl.keyStoreType=PKCS12 server.ssl.keyStoreType=PKCS12
spring.datasource.password=${SPRING_DATASOURCE_PASSWORD} 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} spring.datasource.username=${SPRING_DATASOURCE_USERNAME:-demw}
EOF EOF

View file

@ -8,15 +8,15 @@ COUNTRYCODE=SE
ENTITYID_INT=se-de-middleware ENTITYID_INT=se-de-middleware
SERVER_URL=${SERVER_URL} SERVER_URL=${SERVER_URL}
MIDDLEWARE_CRYPT_ALIAS=${MIDDLEWARE_CRYPT_ALIAS:-demw} 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_CRYPT_PIN=${MIDDLEWARE_CRYPT_PIN}
MIDDLEWARE_SIGN_ALIAS=${MIDDLEWARE_SIGN_ALIAS:-demw} 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} MIDDLEWARE_SIGN_PIN=${MIDDLEWARE_SIGN_PIN}
ORGANIZATION_DISPLAY_NAME=Swedish E-Identification Board ORGANIZATION_DISPLAY_NAME=Swedish E-Identification Board
ORGANIZATION_LANG=sv ORGANIZATION_LANG=sv
ORGANIZATION_NAME=Swedish E-Identification Board ORGANIZATION_NAME=Swedish E-Identification Board
ORGANIZATION_URL=https\://elegnamnden.se ORGANIZATION_URL=https\://elegnamnden.se
SERVICE_PROVIDER_CONFIG_FOLDER=/etc/eidas-middleware/configuration/serviceprovider-metadata SERVICE_PROVIDER_CONFIG_FOLDER=/opt/eidas-middleware/configuration/serviceprovider-metadata
SERVICE_PROVIDER_METADATA_SIGNATURE_CERT=/etc/eidas-middleware/configuration/metadata-signature-certificate.crt SERVICE_PROVIDER_METADATA_SIGNATURE_CERT=/opt/eidas-middleware/configuration/metadata-signature-certificate.crt
EOF EOF