From c2cb19ecf5a7450d7b0e199788a7dae018f1db3e Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Mon, 28 Jun 2021 23:37:14 +0200
Subject: [PATCH] WIP: pipeline
---
.docker/cert.sh | 3 ---
.docker/docker-compose.yml | 5 ++---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/.docker/cert.sh b/.docker/cert.sh
index 598020c..e22cfba 100755
--- a/.docker/cert.sh
+++ b/.docker/cert.sh
@@ -40,9 +40,6 @@ 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 86a4628..b9fd738 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -35,9 +35,8 @@ services:
environment:
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.pk8
- CAOSDB_CONFIG_GRPC_SERVER_CA_PW: CaosDBSecret
+ CAOSDB_CONFIG_GRPC_SERVER_PORT_HTTPS: 8443
+ CAOSDB_CONFIG_GRPC_SERVER_PORT_HTTP: 8080
volumes:
scripting:
extroot:
--
GitLab