summaryrefslogtreecommitdiffstats
path: root/datafile-app-server/src/main
diff options
context:
space:
mode:
authorTamasBakai <tamas.bakai@est.tech>2019-04-10 10:02:21 +0000
committerTamasBakai <tamas.bakai@est.tech>2019-04-10 10:02:21 +0000
commit5983d76f162aef34740a05ae4e78c7d9e2b3c20a (patch)
tree8c06db1fc5317fbceebeb0178068a7fddc1f797f /datafile-app-server/src/main
parent814ddd12e695433b8c6a760cc9424dc1c0bae4d1 (diff)
Updating certificates
Issue-ID: DCAEGEN2-1300 Change-Id: I9ce457b69e5866e77a465fb040d196b8905ca274 Signed-off-by: TamasBakai <tamas.bakai@est.tech>
Diffstat (limited to 'datafile-app-server/src/main')
-rw-r--r--datafile-app-server/src/main/docker/Dockerfile8
-rw-r--r--datafile-app-server/src/main/resources/datafile_endpoints.json4
2 files changed, 7 insertions, 5 deletions
diff --git a/datafile-app-server/src/main/docker/Dockerfile b/datafile-app-server/src/main/docker/Dockerfile
index 6ab30cc2..f39f1cb5 100644
--- a/datafile-app-server/src/main/docker/Dockerfile
+++ b/datafile-app-server/src/main/docker/Dockerfile
@@ -25,16 +25,18 @@ RUN mkdir -p /var/log/ONAP
ADD /target/datafile-app-server.jar /opt/app/datafile/
ADD /config/application.yaml /opt/app/datafile/config/
-ADD /config/cacerts /opt/app/datafile/config/
+ADD /config/dfc.jks.b64 /opt/app/datafile/config/
ADD /config/datafile_endpoints.json /opt/app/datafile/config/
-ADD /config/ftpKey.jks /opt/app/datafile/config/
-ADD /config/keystore /opt/app/datafile/config/
+ADD /config/ftp.jks.b64 /opt/app/datafile/config/
EXPOSE 8100 8433
RUN addgroup -S onap && adduser -S datafile -G onap
RUN chown -R datafile:onap /opt/app/datafile
RUN chown -R datafile:onap /var/log/ONAP
+RUN base64 -d /opt/app/datafile/config/dfc.jks.b64 > /opt/app/datafile/config/dfc.jks && base64 -d /opt/app/datafile/config/ftp.jks.b64 > /opt/app/datafile/config/ftp.jks
+RUN chown -R root:root /opt/app/datafile/config/*
+RUN chmod -R 755 /opt/app/datafile/config/
USER datafile
diff --git a/datafile-app-server/src/main/resources/datafile_endpoints.json b/datafile-app-server/src/main/resources/datafile_endpoints.json
index 0cf41887..d864c11d 100644
--- a/datafile-app-server/src/main/resources/datafile_endpoints.json
+++ b/datafile-app-server/src/main/resources/datafile_endpoints.json
@@ -26,9 +26,9 @@
},
"ftp": {
"ftpesConfiguration": {
- "keyCert": "config/ftpKey.jks",
+ "keyCert": "config/dfc.jks",
"keyPassword": "secret",
- "trustedCA": "config/cacerts",
+ "trustedCA": "config/ftp.jks",
"trustedCAPassword": "secret"
}
}