Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix difference in truststore env var name #321

Merged
merged 2 commits into from
Nov 5, 2020

Conversation

Alexjsenn
Copy link
Contributor

Not sure when it was changed, but the name of the env var for the ssl truststore was changed in entrypoint, and was not updated in the certificatePostHandler.

andrewazores
andrewazores previously approved these changes Nov 5, 2020
@andrewazores andrewazores dismissed their stale review November 5, 2020 19:36

another update needed

@andrewazores
Copy link
Member

$ ag --ignore-dir web-client TRUSTSTORE_DIR
src/main/java/com/redhat/rhjmc/containerjfr/net/web/http/api/v2/CertificatePostHandler.java
78:    private static final String TRUSTSTORE_DIR = "TRUSTSTORE_DIR";
142:        if (!env.hasEnv(TRUSTSTORE_DIR)) {
146:        String truststoreDir = env.getEnv(TRUSTSTORE_DIR);

src/main/extras/app/entrypoint.sh
40:if [ -z "$SSL_TRUSTSTORE_DIR" ]; then
41:    SSL_TRUSTSTORE_DIR="/truststore"
44:export SSL_TRUSTSTORE_DIR
60:    if [ ! -d "$SSL_TRUSTSTORE_DIR" ]; then
61:        banner "$SSL_TRUSTSTORE_DIR does not exist; no certificates to import"
63:    elif [ ! "$(ls -A $SSL_TRUSTSTORE_DIR)" ]; then
64:        banner "$SSL_TRUSTSTORE_DIR is empty; no certificates to import"
68:    for cert in $(find "$SSL_TRUSTSTORE_DIR" -type f); do
168:export SSL_TRUSTSTORE_DIR

HTTP_API.md
1274:    `500` - The `TRUSTSTORE_DIR` environment variable is not set, or there is an unexpected error. The body is an error message.

Could you update that line in HTTP_API.md while we're at it?

@andrewazores andrewazores merged commit a53ad4c into cryostatio:main Nov 5, 2020
aali309 pushed a commit to aali309/cryostat-legacy that referenced this pull request Jul 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants