diff --git a/configure.sh b/configure.sh index 8e4250bb379654c32fa9c4fc59948c77fe7d0fc4..0227ca6388e2ddfc7d4d5569cd5705f3b1517f0a 100644 --- a/configure.sh +++ b/configure.sh @@ -2,7 +2,7 @@ echo "Running configure.sh" >&2 # substitute template values -cat /shibboleth2_template.xml \ +cat ./shibboleth2_template.xml \ | sed -e "s/{{SPEntityID}}/$(echo ${SPEntityID} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \ | sed -e "s/{{IDPEntityID}}/$(echo ${IDPEntityID} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \ > /etc/shibboleth/shibboleth2.xml @@ -22,12 +22,12 @@ create_xml_user_category_rules () { USER_CATEGORY_ALLOW_LIST=$(create_xml_user_category_rules "$USER_CATEGORY_ALLOW_RENDERER") # renderer access rules template fill -cat /pass_accessrules_template.xml \ +cat ./pass_accessrules_template.xml \ | sed -e "s/{{USER_CATEGORY_ALLOW_LIST}}/$(echo ${USER_CATEGORY_ALLOW_LIST} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \ > /etc/shibboleth/pass-ac.xml # cache access rules template fill USER_CATEGORY_ALLOW_LIST=$(create_xml_user_category_rules "$USER_CATEGORY_ALLOW_CACHE") -cat /pass_accessrules_template.xml \ +cat ./pass_accessrules_template.xml \ | sed -e "s/{{USER_CATEGORY_ALLOW_LIST}}/$(echo ${USER_CATEGORY_ALLOW_LIST} | sed -e 's/[]\/$*.^[]/\\&/g')/g" \ > /etc/shibboleth/pass-ac-cache.xml diff --git a/run-shibboleth.sh b/run-shibboleth.sh index eb92c7deecfef4b56d333890149c9c2bce322c2a..3fe555f44ebb63dcdc49531b6d1baaf26f439a2f 100644 --- a/run-shibboleth.sh +++ b/run-shibboleth.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -/configure.sh >&2 +./configure.sh >&2 #### Copied over from the source Dockerfile ####