Skip to content

Commit

Permalink
Fix config targets in Makefile (mattermost#27746)
Browse files Browse the repository at this point in the history
  • Loading branch information
hanzei authored Jul 24, 2024
1 parent d8c16cd commit caff13c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -653,7 +653,7 @@ config-ldap: ## Configures LDAP.
# Check if jq is installed
@jq --version > /dev/null 2>&1 || (echo "jq is not installed. Please install jq to continue." && exit 1)

TMPDIR=$(mktemp -d)
$(eval TMPDIR := $(shell mktemp -d))
jq --slurp '.[0] * .[1]' ${CONFIG_FILE_PATH} build/docker/keycloak/ldap.mmsettings.json > ${TMPDIR}/config.json
cp ${TMPDIR}/config.json ${CONFIG_FILE_PATH}
rm ${TMPDIR}/config.json
Expand All @@ -666,7 +666,7 @@ config-saml: ## Configures SAML.

@cp build/docker/keycloak/keycloak.crt ./config/saml-idp.crt

TMPDIR=$(mktemp -d)
$(eval TMPDIR := $(shell mktemp -d))
jq --slurp '.[0] * .[1]' ${CONFIG_FILE_PATH} build/docker/keycloak/saml.mmsettings.json > ${TMPDIR}/config.json
cp ${TMPDIR}/config.json ${CONFIG_FILE_PATH}
rm ${TMPDIR}/config.json
Expand All @@ -677,7 +677,7 @@ config-openid: ## Configures OpenID.
# Check if jq is installed
@jq --version > /dev/null 2>&1 || (echo "jq is not installed. Please install jq to continue." && exit 1)

TMPDIR=$(mktemp -d)
$(eval TMPDIR := $(shell mktemp -d))
jq --slurp '.[0] * .[1]' ${CONFIG_FILE_PATH} build/docker/keycloak/openid.mmsettings.json > ${TMPDIR}/config.json
cp ${TMPDIR}/config.json ${CONFIG_FILE_PATH}
rm ${TMPDIR}/config.json
Expand Down

0 comments on commit caff13c

Please sign in to comment.