do not delete oidc config in non-sso mode
This commit is contained in:
12
start.sh
12
start.sh
@@ -52,16 +52,6 @@ xmlstarlet ed --inplace \
|
|||||||
# origin
|
# origin
|
||||||
xmlstarlet ed --inplace --update '//properties/entry[@key="web.url"]' -v "${CLOUDRON_APP_ORIGIN}" /app/data/traccar.xml
|
xmlstarlet ed --inplace --update '//properties/entry[@key="web.url"]' -v "${CLOUDRON_APP_ORIGIN}" /app/data/traccar.xml
|
||||||
|
|
||||||
# get rid of ldap, can be removed in the next release
|
|
||||||
sed -e 's/ldap.url/openid.clientId/g' \
|
|
||||||
-e 's/ldap.base/openid.clientSecret/g' \
|
|
||||||
-e 's/ldap.idAttribute/openid.issuerUrl/g' \
|
|
||||||
-e 's/ldap.searchFilter/openid.authUrl/g' \
|
|
||||||
-e 's/ldap.user/openid.tokenUrl/g' \
|
|
||||||
-e 's/ldap.password/openid.userInfoUrl/g' \
|
|
||||||
-e 's/^.*ldap\..*$//g' \
|
|
||||||
-i /app/data/traccar.xml
|
|
||||||
|
|
||||||
# OIDC
|
# OIDC
|
||||||
if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
|
if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
|
||||||
echo "=> Ensure OIDC settings"
|
echo "=> Ensure OIDC settings"
|
||||||
@@ -73,8 +63,6 @@ if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
|
|||||||
--update '//properties/entry[@key="openid.tokenUrl"]' -v "${CLOUDRON_OIDC_TOKEN_ENDPOINT}" \
|
--update '//properties/entry[@key="openid.tokenUrl"]' -v "${CLOUDRON_OIDC_TOKEN_ENDPOINT}" \
|
||||||
--update '//properties/entry[@key="openid.userInfoUrl"]' -v "${CLOUDRON_OIDC_PROFILE_ENDPOINT}" \
|
--update '//properties/entry[@key="openid.userInfoUrl"]' -v "${CLOUDRON_OIDC_PROFILE_ENDPOINT}" \
|
||||||
/app/data/traccar.xml
|
/app/data/traccar.xml
|
||||||
else
|
|
||||||
sed -e 's/^.*openid\..*$//g' -i /app/data/traccar.xml
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# email
|
# email
|
||||||
|
Reference in New Issue
Block a user