From 37ffaee471e8095a102c877cbc333305aad593dc Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Fri, 12 Aug 2022 09:07:45 +0800 Subject: [PATCH] Supported either HTTP or HTTPS Issue-ID: HOLMES-511 Signed-off-by: Guangrong Fu Change-Id: I846694f584f49e74a3c3f603ee245f9b4ad28a36 --- engine-d-standalone/src/main/assembly/bin/run.sh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/engine-d-standalone/src/main/assembly/bin/run.sh b/engine-d-standalone/src/main/assembly/bin/run.sh index 2c58d35..f4c76cb 100644 --- a/engine-d-standalone/src/main/assembly/bin/run.sh +++ b/engine-d-standalone/src/main/assembly/bin/run.sh @@ -92,17 +92,15 @@ sed -i "s|key-store:.*|key-store: $KEY_PATH|" "$main_path/conf/application.yaml" sed -i "s|key-store-password:.*|key-store-password: $KEY_PASSWORD|" "$main_path/conf/application.yaml" if [ "${ENABLE_ENCRYPT}"x = "true"x ]; then - sed -i "s|type:\s*https\?$|type: https|" "$main_path/conf/engine-d.yml" - sed -i "s|#\?keyStorePath|keyStorePath|" "$main_path/conf/engine-d.yml" - sed -i "s|#\?keyStorePassword|keyStorePassword|" "$main_path/conf/engine-d.yml" - sed -i "s|#\?validateCerts|validateCerts|" "$main_path/conf/engine-d.yml" - sed -i "s|#\?validatePeers|validatePeers|" "$main_path/conf/engine-d.yml" + sed -i "s|#\?ssl:|ssl:|" "$main_path/conf/application.yaml" + sed -i "s|#\?key-store|key-store|" "$main_path/conf/application.yaml" + sed -i "s|#\?key-store-password|key-store-password|" "$main_path/conf/application.yaml" + sed -i "s|#\?key-store-type|key-store-type|" "$main_path/conf/application.yaml" else - sed -i 's|type:\s*https\?$|type: http|' "$main_path/conf/engine-d.yml" - sed -i "s|#\?keyStorePath|#keyStorePath|" "$main_path/conf/engine-d.yml" - sed -i "s|#\?keyStorePassword|#keyStorePassword|" "$main_path/conf/engine-d.yml" - sed -i "s|#\?validateCerts|#validateCerts|" "$main_path/conf/engine-d.yml" - sed -i "s|#\?validatePeers|#validatePeers|" "$main_path/conf/engine-d.yml" + sed -i 's|#\?ssl:|#ssl:|' "$main_path/conf/application.yaml" + sed -i "s|#\?key-store|#key-store|" "$main_path/conf/application.yaml" + sed -i "s|#\?key-store-password|#key-store-password|" "$main_path/conf/application.yaml" + sed -i "s|#\?key-store-type|#key-store-type|" "$main_path/conf/application.yaml" fi cat "$main_path/conf/application.yaml" -- 2.16.6