diff --git a/.docker/cert.sh b/.docker/cert.sh index 598020c46bb6b7fd879d9d281caf252ac2c0a92b..e22cfba2995b5fd9d812232f562b7254233fe5b0 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 86a46285cf9877d89433d09d1da45cf2f6d575c7..b9fd73819f8b78fc855344ed732c72c0fd959d4e 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: