Fixed support for new directorys in remove-script.

Also removed sp-with-simplesign since it's no longer in use

2 files changed, 2 insertions, 152 deletions

diff --git a/scripts/remove_entity.sh b/scripts/remove_entity.sh
index ae55a51e..60645a7e 100755
--- a/scripts/remove_entity.sh
+++ b/scripts/remove_entity.sh
@@ -36,11 +36,11 @@ else
 	entityidfn=$(echo "$entityid" | sed 's;.*://;;' | sed 's/[^a-zwA-ZW0-9_.-]/-/g' | sed 's/$/.xml/')
 	[ -n "$entityidfn" ] || error "Failed to generate filename from entityid $entityid"
 fi
-file="swamid-2.0/$entityidfn"
+file=$(find swamid-testing swamid-2.0 swamid-edugain -name "$entityidfn" | head -1)
 
 if [ -r "$file" ]; then
 	echo "---------------------"
-	grep "/$entityidfn" ./*.mxml sp-with-simplesign
+	grep "$file" ./*.mxml
 	echo "---------------------"
 	echo -n "OK to remove ? [Y/n]"
 	read -r x
@@ -50,13 +50,6 @@ if [ -r "$file" ]; then
 	esac
 
 	echo
-	if (grep -q "$entityidfn" sp-with-simplesign); then
-	    sed -i.bak "/\/$entityidfn/d" sp-with-simplesign
-	    if [ -f sp-with-simplesign.bak ]; then
-		rm sp-with-simplesign.bak
-	    fi
-
-	fi
 	git rm "$file"
 
 	grep "$file" ./*.mxml | sed 's/\(.*\.mxml\):  <xi:include href=".*"\/>/\1/' | while read -r mxmlfile ; do
diff --git a/sp-with-simplesign b/sp-with-simplesign
deleted file mode 100644
index 550b539a..00000000
--- a/sp-with-simplesign
+++ /dev/null
@@ -1,143 +0,0 @@
-# Old SP:s with SimpleSign
-# Do not allow new SP:s with SimpleSign enabled
-# Shibboleth SP 2.5+ defaults to SimpleSign, failes on ADFS IdP:s
-# fredrik - 2014-04-08
-account.mdh.se-shibboleth.xml
-accountcheckout.lnu.se.xml
-activate-test.du.se-shibboleth.xml
-aktivera-test.su.se-shibboleth.sso.xml
-aktivera.su.se-shibboleth.sso.xml
-bedomningshandboken.uhr.se-shibboleth.xml
-beta.lobber.se-shibboleth.xml
-betafoo.nordu.net-shibboleth.xml
-bhb-00.its.umu.se-gui-sp.xml
-bhb-00.its.umu.se-user-idp.xml
-brainstorm.swami.se-shibboleth.xml
-cambro-test-26.umdc.umu.se-shibboleth.xml
-cambro-tst1.umdc.umu.se-shibboleth.xml
-cambro-utv1.umdc.umu.se-shibboleth.xml
-cdn.nordunet.tv-shibboleth.xml
-ci.nordu.net-shibboleth.xml
-coip-test.sunet.se-shibboleth.xml
-confluence-test.it.su.se-shibboleth.sso.xml
-confluence.it.su.se-shibboleth.sso.xml
-connect-beta.sunet.se-shibboleth.xml
-connect-stable.sunet.se-shibboleth.xml
-connect-test.sunet.se-shibboleth.xml
-connect.funet.fi-shibboleth.xml
-connect.sunet.se-shibboleth.xml
-connect.uninett.no-shibboleth.xml
-converis.info-shibboleth.xml
-crowd.nordu.net-shibboleth.xml
-crowdtest.nordu.net-shibboleth.xml
-dev.lobber.se-shibboleth.xml
-download.portal.chalmers.se-shibboleth.xml
-dwidp.nyautb.its.umu.se-dw-idp.xml
-e5.onthehub.com.xml
-epc.ub.uu.se-shibboleth.xml
-expert.antagning.se-ecs-sp.xml
-expert.nyautb.its.umu.se-ecs-sp.xml
-fordrop.irt.kth.se-shibboleth.xml
-gallus.scilifelab.se-shibboleth.xml
-hades.slu.se-shibboleth.xml
-hbidp-test.test.hb.se-idp-shibboleth.xml
-hr.liu.se-shibboleth.xml
-hr.su.se-shibboleth.xml
-idp-test.nordu.net-idp-shibboleth.xml
-idp.esh.se-idp-shibboleth.xml
-idp.hb.se-idp-shibboleth.xml
-idp.hkr.se-idp-shibboleth.xml
-idp.it.su.se-idp-shibboleth.xml
-idp.kmh.se-idp-shibboleth.xml
-idp.kva.se-idp-shibboleth.xml
-idp.lnu.se-idp-shibboleth.xml
-idp.mah.se-idp-shibboleth.xml
-idp.nordu.net-idp-shibboleth.xml
-idp.test.antagning.se-aws-idp.xml
-its-pd0328.ad.umu.se-shibboleth.xml
-its-pd0030.ad.umu.se-shibboleth.xml
-its-pd0062.ad.umu.se-shibboleth-sp.xml
-kisetest2.user.ki.se-shibboleth.xml
-kitstidp01.tst.ki.se-idp-shibboleth.xml
-kurser.math.su.se-shibboleth.xml
-ladok3.its.umu.se-user-idp.xml
-ladok3test.its.umu.se-user-idp.xml
-lartorget.sll.se-shibboleth.xml
-local.cloudmore.com-shibboleth.xml
-login-dev.du.se-idp-shibboleth.xml
-login.du.se-idp-shibboleth.xml
-login.idp.hhs.se-idp-shibboleth.xml
-login2.temp1235.hhs.se-idp-shibboleth.xml
-mailfilter-test.nordu.net-shibboleth.xml
-mailfilter.nordu.net-shibboleth.xml
-mailfilter.sunet.se-shibboleth.xml
-maps.slu.se-shibboleth.xml
-mds-test.sunet.se-shibboleth.xml
-mds.lan.kth.se-shibboleth.xml
-mds.sunet.se-shibboleth.xml
-mds2.nordu.net-shibboleth.xml
-meetingtools.nordu.net-shibboleth.xml
-minasidor.ladok.umu.se-shib-sp.xml
-minastudier.ladok.umu.se-user-idp.xml
-mondo-test.su.se-shibboleth.sso.xml
-mondo.su.se-shibboleth.sso.xml
-mp.uu.se-Shibboleth.sso.xml
-nagios-vm.nordu.net-shibboleth.xml
-nagios.nordu.net-shibboleth.xml
-ni.nordu.net-shibboleth.xml
-nordushare-dev.nordu.net-shibboleth.xml
-pingpong.ki.se-shibboleth.xml
-portal.mdh.se-shibboleth.xml
-referens-idp.skolfederation.se-idp-shibboleth.xml
-saml.sys.kth.se-idp-shibboleth.xml
-selfservice.hb.se-shibboleth.xml
-sgw.africa-grid.org-shibboleth.xml
-shib-1-r.referens.sys.kth.se-idp-shibboleth.xml
-shib-idp-2.oru.se-idp-shibboleth.xml
-shib-idp-test.oru.se-idp-shibboleth.xml
-shib1.oru.se-shibboleth.xml
-shibboleth.ebscohost.com.xml
-shibboleth.msacademicverify.com-shibboleth-sp.xml
-shibboleth.nyautb.its.umu.se-shibboleth-idp.xml
-shibboleth.turnitin.com-shibboleth.xml
-shibboleth.uhr.se-idp-shibboleth.xml
-shibdev.rsc.org-shibboleth.xml
-smd-dev.nordu.net-shibboleth.xml
-smd.du.se-shibboleth.xml
-sp-nya.bth.se-shibboleth.xml
-sp-test.it.su.se-shibboleth.sso.xml
-sp.it.gu.se-shibboleth.xml
-sp.spraakbanken.gu.se-shibboleth.xml
-sp.tools.sunet.se-shibboleth.xml
-su.avedas.com-shibboleth.xml
-swamid2.shh.se-idp-shibboleth.xml
-tcs-test.sunet.se-shibboleth.xml
-test-ki.pingpong.net-shibboleth.xml
-test.mp.uu.se-Shibboleth.sso.xml
-testshib.msacademicverify.com-shibboleth-sp.xml
-tta-portal.misc.kth.se-shibboleth.xml
-unitcf.se-shibboleth.xml
-uraccess.se-shibboleth-sp.xml
-uu.test.diva-portal.org-shibboleth.xml
-vfu-test.su.se-shibboleth.sso.xml
-vfu.su.se-shibboleth.sso.xml
-vhs-dev01.dyndns.org-shibboleth-sp.xml
-vlab-chemsub.explizit.se-shibboleth.xml
-vmfront.lan.kth.se-shibboleth.xml
-webapp-utv.ita.mdh.se-shibboleth.xml
-webinar.nordu.net-shibboleth.xml
-weblogin.uu.se-idp-shibboleth.xml
-wiki.its.uu.se-shibboleth.xml
-wl07089.sigma.local-shibboleth.xml
-wp.nordu.net-shibboleth.xml
-www-en.nyautb.its.umu.se-aws-sp-en.xml
-www.akademiskahogtider.se-shibboleth.xml
-www.antagning.nyautb.its.umu.se-ecs-sp.xml
-www.antagning.se-aws-sp.xml
-www.diva-portal.org-shibboleth.xml
-www.nyautb.its.umu.se-aws-sp.xml
-www.studera.nyautb.its.umu.se-aws-sp.xml
-www.universityadmissions.se-aws-sp-en.xml
-www.wisum.its.umu.se-shibboleth.xml
-www07test.sub.su.se.xml
-www4.genuinetext.com-shibboleth.xml