From 7af72501d07d3a7f9b5a6591858e399ca8a6da1c Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 28 Jun 2021 16:16:21 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/cert.sh | 3 +++
.docker/docker-compose.yml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.docker/cert.sh b/.docker/cert.sh
index e22cfba..17a8249 100755
--- a/.docker/cert.sh
+++ b/.docker/cert.sh
@@ -40,6 +40,9 @@ function cert() {
# NOTE: KEYPW and KEYSTOREPW are the same, due to Java limitations.
KEYPW="${KEYPW}" openssl genrsa -aes256 -out caosdb.key.pem \
-passout env:KEYPW 2048
+ # also store in pkcs format
+ KEYPW="${KEYPW}" openssl pkcs8 -topk8 -in caosdb.key.pem
+ -out caosdb.key.pk8 -passin env:KEYPW -passout env:KEYPW
# Certificate is for localhost
KEYPW="${KEYPW}" openssl req -new -x509 -key caosdb.key.pem \
-out caosdb.cert.pem -passin env:KEYPW \
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 63b6771..86a4628 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -36,7 +36,7 @@ services:
DEBUG: 1
CAOSDB_CONFIG_AUTHTOKEN_CONFIG: "conf/core/authtoken.example.yaml"
CAOSDB_CONFIG_GRPC_SERVER_CA_PUB_PEM: /opt/caosdb/cert/caosdb.cert.pem
- CAOSDB_CONFIG_GRPC_SERVER_CA_PRIV_PEM: /opt/caosdb/cert/caosdb.key.pem
+ CAOSDB_CONFIG_GRPC_SERVER_CA_PRIV_PEM: /opt/caosdb/cert/caosdb.key.pk8
CAOSDB_CONFIG_GRPC_SERVER_CA_PW: CaosDBSecret
volumes:
scripting:
--
GitLab