Skip to content

Commit

Permalink
cleanup no longer used pieces
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewazores committed Oct 20, 2021
1 parent 7de8b0e commit edf9455
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 20 deletions.
6 changes: 2 additions & 4 deletions certs/generate-dev-certs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ SSL_TRUSTSTORE_PASS=$(genpass)

SSL_KEYSTORE_PASS=$(genpass)

ALIAS=RS256

pushd $CERTS_DIR
trap popd EXIT

Expand All @@ -57,7 +55,7 @@ keytool \

keytool \
-genkeypair -v \
-alias "$ALIAS" \
-alias custom-cryostat \
-dname "cn=cryostat, o=Cryostat, c=CA" \
-storetype PKCS12 \
-validity 365 \
Expand All @@ -67,7 +65,7 @@ keytool \

keytool \
-exportcert -v \
-alias "$ALIAS" \
-alias custom-cryostat \
-keystore "$SSL_KEYSTORE" \
-storepass "$SSL_KEYSTORE_PASS" \
-file server.cer
Expand Down
5 changes: 0 additions & 5 deletions run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ if [ -z "$KEYSTORE_PATH" ] && [ -f "$(dirname $0)/certs/cryostat-keystore.p12" ]
KEYSTORE_PASS="$(cat $(dirname $0)/certs/keystore.pass)"
fi

if [ -z "$CRYOSTAT_SUPPORTED_SIGNING_ALGOS" ]; then
CRYOSTAT_SUPPORTED_SIGNING_ALGOS="RS256,none";
fi

if [ ! -d "$(dirname $0)/conf" ]; then
mkdir "$(dirname $0)/conf"
fi
Expand Down Expand Up @@ -100,7 +96,6 @@ podman run \
-e CRYOSTAT_TEMPLATE_PATH="/opt/cryostat.d/templates.d" \
-e CRYOSTAT_CLIENTLIB_PATH="/clientlib" \
-e CRYOSTAT_REPORT_GENERATION_MAX_HEAP="$CRYOSTAT_REPORT_GENERATION_MAX_HEAP" \
-e CRYOSTAT_SUPPORTED_SIGNING_ALGOS="$CRYOSTAT_SUPPORTED_SIGNING_ALGOS" \
-e GRAFANA_DATASOURCE_URL=$GRAFANA_DATASOURCE_URL \
-e GRAFANA_DASHBOARD_URL=$GRAFANA_DASHBOARD_URL \
-e KEYSTORE_PATH=$KEYSTORE_PATH \
Expand Down
7 changes: 3 additions & 4 deletions src/main/extras/app/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function generateSslCert() {
pushd /tmp

keytool -genkeypair -v \
-alias RS256 \
-alias cryostat \
-dname "cn=cryostat, o=Cryostat, c=CA" \
-storetype PKCS12 \
-validity 180 \
Expand All @@ -80,7 +80,7 @@ function generateSslCert() {
-keystore "$SSL_KEYSTORE"

keytool -exportcert -v \
-alias RS256 \
-alias cryostat \
-keystore "$SSL_KEYSTORE" \
-storepass "$SSL_STORE_PASS" \
-file server.cer
Expand All @@ -89,7 +89,7 @@ function generateSslCert() {
-noprompt \
-trustcacerts \
-keystore "$SSL_TRUSTSTORE" \
-alias RS256 \
-alias selftrust \
-file server.cer \
-storepass "$SSL_TRUSTSTORE_PASS"

Expand Down Expand Up @@ -135,7 +135,6 @@ else
if [ -z "$KEYSTORE_PATH" ] || [ -z "$KEYSTORE_PASS" ]; then
generateSslCert
banner "Using self-signed SSL certificate"
export CRYOSTAT_SUPPORTED_SIGNING_ALGOS="RS256,none"

KEYSTORE_PATH="$SSL_KEYSTORE"
KEYSTORE_PASS="$SSL_KEY_PASS"
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/io/cryostat/net/web/WebServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -294,26 +294,26 @@ URI getHostUri() throws SocketException, UnknownHostException, URISyntaxExceptio
.normalize();
}

// FIXME this has a non-explicit dependency on the RecordingGetHandler path
// FIXME this has an implicit dependency on the RecordingGetHandler path
public String getArchivedDownloadURL(String recordingName)
throws UnknownHostException, URISyntaxException, SocketException {
return getAssetDownloadURL(ApiVersion.V1, "recordings", recordingName);
}

// FIXME this has a non-explicit dependency on the TargetRecordingGetHandler path
// FIXME this has a an implicit dependency on the TargetRecordingGetHandler path
public String getDownloadURL(JFRConnection connection, String recordingName)
throws URISyntaxException, IOException {
return getAssetDownloadURL(
ApiVersion.V1, "targets", getTargetId(connection), "recordings", recordingName);
}

// FIXME this has a non-explicit dependency on the ReportGetHandler path
// FIXME this has a an implicit dependency on the ReportGetHandler path
public String getArchivedReportURL(String recordingName)
throws SocketException, UnknownHostException, URISyntaxException {
return getAssetDownloadURL(ApiVersion.V1, "reports", recordingName);
}

// FIXME this has a non-explicit dependency on the TargetReportGetHandler path
// FIXME this has a an implicit dependency on the TargetReportGetHandler path
public String getReportURL(JFRConnection connection, String recordingName)
throws URISyntaxException, IOException {
return getAssetDownloadURL(
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/logging.properties

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/resources/vertx-default-jul-logging.properties

This file was deleted.

0 comments on commit edf9455

Please sign in to comment.