From 062982915fede6a345927a40b381d3fe6214b634 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Thu, 22 Aug 2024 17:25:06 +0300 Subject: [PATCH] Add the ability to configure the amqps protocol in packages --- install/common/product-configuration | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/install/common/product-configuration b/install/common/product-configuration index e51196f361f..e670fbc91fa 100644 --- a/install/common/product-configuration +++ b/install/common/product-configuration @@ -28,6 +28,7 @@ ELK_HOST="localhost" ELK_PORT="9200" OPENSEARCH_INDEX="${PACKAGE_SYSNAME}-fluent-bit" +RABBITMQ_PROTOCOL="amqp" RABBITMQ_HOST="localhost" RABBITMQ_USER="guest" RABBITMQ_PASSWORD="guest" @@ -216,6 +217,7 @@ while [ "$1" != "" ]; do echo " -rbp, --rabbitmqport rabbitmq port" echo " -rbu, --rabbitmquser rabbitmq user" echo " -rbpw, --rabbitmqpassword rabbitmq password" + echo " -rbpr, --rabbitmqprotocol rabbitmq protocol" echo " -mysqlh, --mysqlhost mysql server host" echo " -mysqld, --mysqldatabase ${PRODUCT} database name" echo " -mysqlu, --mysqluser ${PRODUCT} database user" @@ -588,7 +590,7 @@ setup_docs() { local DOCUMENT_SERVER_JWT_SECRET=${DOCUMENT_SERVER_JWT_SECRET:-$(json -f ${DS_CONF_DIR}/local.json services.CoAuthoring.secret.inbox.string)} local DOCUMENT_SERVER_JWT_HEADER=${DOCUMENT_SERVER_JWT_HEADER:-$(json -f ${DS_CONF_DIR}/local.json services.CoAuthoring.token.inbox.header)} - $JSON ${DS_CONF_DIR}/local.json -e "this.rabbitmq = { 'url': 'amqp://${RABBITMQ_USER}:${RABBITMQ_PASSWORD}@${RABBITMQ_HOST}:${RABBITMQ_PORT}' }" >/dev/null 2>&1 + $JSON ${DS_CONF_DIR}/local.json -e "this.rabbitmq = { 'url': '${RABBITMQ_PROTOCOL}://${RABBITMQ_USER}:${RABBITMQ_PASSWORD}@${RABBITMQ_HOST}:${RABBITMQ_PORT}' }" >/dev/null 2>&1 $JSON ${DS_CONF_DIR}/local.json -e "this.services.CoAuthoring.redis = { 'host': '$REDIS_HOST' }" >/dev/null 2>&1 sed 's/\(listen .*:\)\([0-9]\{2,5\}\b\)\( default_server\)\?\(;\)/\1'${DOCUMENT_SERVER_PORT}'\3\4/' -i ${DS_CONF_DIR}/nginx/ds.conf @@ -796,6 +798,9 @@ setup_rabbitmq() { save_undefined_param "${APP_DIR}/rabbitmq.${ENVIRONMENT}.json" "RabbitMQ.Password" "${RABBITMQ_PASSWORD}" "$EXTERNAL_RABBITMQ_FLAG" save_undefined_param "${APP_DIR}/rabbitmq.${ENVIRONMENT}.json" "RabbitMQ.Port" "${RABBITMQ_PORT}" "$EXTERNAL_RABBITMQ_FLAG" save_undefined_param "${APP_DIR}/rabbitmq.${ENVIRONMENT}.json" "RabbitMQ.VirtualHost" "/" + if [[ ${RABBITMQ_PROTOCOL} = "amqps" ]] && [[ ${RABBITMQ_HOST} != "localhost" ]]; then + save_undefined_param "${APP_DIR}/rabbitmq.${ENVIRONMENT}.json" "RabbitMQ.Uri" "${RABBITMQ_PROTOCOL}://${RABBITMQ_USER}:${RABBITMQ_PASSWORD}@${RABBITMQ_HOST}:${RABBITMQ_PORT}/" + fi if [ $1 == "LOCAL_RABBITMQ_SERVER" ]; then systemctl enable rabbitmq-server >/dev/null 2>&1