Skip to content

Commit

Permalink
text assignment instead of execution
Browse files Browse the repository at this point in the history
WS reverted to upstream
  • Loading branch information
hdaems committed Oct 28, 2021
1 parent d530295 commit e417444
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
.idea
logs
.editorConfig

4 changes: 2 additions & 2 deletions jboss/container/wildfly/launch/jgroups/added/launch/ha.sh
Original file line number Diff line number Diff line change
Expand Up @@ -291,12 +291,12 @@ configure_ha_args() {
# Set HA args
IP_ADDR=$(get_host_ipv4)
JBOSS_HA_ARGS="-b ${JBOSS_HA_IP:-${IP_ADDR}} -bprivate ${JBOSS_HA_IP:-${IP_ADDR}}"

init_node_name

JBOSS_HA_ARGS="${JBOSS_HA_ARGS} -Djboss.node.name=${JBOSS_NODE_NAME}"
}



configure_ha() {
configure_ha_args
JGROUPS_AUTH=$(generate_jgroups_auth_config "${JGROUPS_CLUSTER_PASSWORD}" "${JGROUPS_DIGEST_TOKEN_ALGORITHM}")
Expand Down
3 changes: 2 additions & 1 deletion jboss/container/wildfly/launch/keycloak/added/keycloak.sh
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ function configure_cli_keycloak() {
enable_keycloak_deployments
elif [ -n "$SSO_URL" ]; then
enable_keycloak_deployments

oidc_extension="$(configure_OIDC_extension)"
saml_extension="$(configure_SAML_extension)"
oidc_elytron="$(configure_OIDC_elytron $id)"
Expand Down Expand Up @@ -936,4 +937,4 @@ function query_routes_from_service() {
fi
fi
fi
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function configure() {
}

function configure_artemis_address() {
IP_ADDR=${JBOSS_MESSAGING_HOST:-get_host_ipv4}
IP_ADDR=${JBOSS_MESSAGING_HOST:-$(get_host_ipv4)}
JBOSS_MESSAGING_ARGS="${JBOSS_MESSAGING_ARGS} -Djboss.messaging.host=${IP_ADDR}"
}
# /subsystem=messaging-activemq/server=default/jms-queue=queue_name:add(entries=[])
Expand Down Expand Up @@ -1104,4 +1104,4 @@ can_add_embedded(){
fi

return 0
}
}

0 comments on commit e417444

Please sign in to comment.