diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-01-20 10:18:54 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-01-20 10:18:54 +0100 |
| commit | 5e8720f89568ea09a4018cc2a3a14b2820086952 (patch) | |
| tree | 42a47ab02f5e76f447cadc2a732bbd1ce778d2bb | |
| parent | e7461ad394c962efeb65e2985fdf17971364f2c6 (diff) | |
split off interfederations from externals
| -rw-r--r-- | NewMakefile | 3 | ||||
| -rwxr-xr-x | scripts/aggregate.sh | 15 | ||||
| -rw-r--r-- | swamid-externals-1.0/metadata.lst | 1 |
3 files changed, 15 insertions, 4 deletions
diff --git a/NewMakefile b/NewMakefile index b3c362f3..ddefdec4 100644 --- a/NewMakefile +++ b/NewMakefile @@ -27,6 +27,9 @@ swamid-compat: urn-mace-swami.se-swamid-test-1.0-metadata.mxml swamid-externals: @scripts/aggregate.sh swamid-externals-1.0 +swamid-interfederations: + @scripts/aggregate.sh swamid-interfederations-1.0 + swamid: @saml-md-tool swamid-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) @test -s swamid-1.0.xml && cp swamid-1.0.xml $(DEST) diff --git a/scripts/aggregate.sh b/scripts/aggregate.sh index 7565e48a..92eb3b5c 100755 --- a/scripts/aggregate.sh +++ b/scripts/aggregate.sh @@ -1,7 +1,16 @@ #!/bin/sh DIR=`pwd` +ODIR=$1 -$DIR/scripts/pull-and-verify.sh 'http://spaces.internet2.edu/Shibboleth.sso/Metadata' $1 $DIR/certs/spaces.internet2.edu.crt -$DIR/scripts/pull-and-verify.sh 'https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml' $1 $DIR/certs/kalmar-signer.crt -$DIR/scripts/pull-and-verify.sh 'http://discovery.shibboleth.net/shibboleth.net-metadata.xml' $1 +(while read url cert; do + cfile="" + if [ "x$cert" != "x" ]; then + cfile=$DIR/certs/$cert + fi + $DIR/scripts/pull-and-verify.sh $url $ODIR $cfile +done) < $ODIR/metadata.lst + +#$DIR/scripts/pull-and-verify.sh 'http://spaces.internet2.edu/Shibboleth.sso/Metadata' $1 $DIR/certs/spaces.internet2.edu.crt +#$DIR/scripts/pull-and-verify.sh 'https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml' $1 $DIR/certs/kalmar-signer.crt +#$DIR/scripts/pull-and-verify.sh 'http://discovery.shibboleth.net/shibboleth.net-metadata.xml' $1 diff --git a/swamid-externals-1.0/metadata.lst b/swamid-externals-1.0/metadata.lst index 0462f139..96c77b4b 100644 --- a/swamid-externals-1.0/metadata.lst +++ b/swamid-externals-1.0/metadata.lst @@ -1,3 +1,2 @@ http://spaces.internet2.edu/Shibboleth.sso/Metadata spaces.internet2.edu.crt -https://kalmar2.org/simplesaml/module.php/aggregator/?id=kalmarcentral2&set=saml2&exclude=sweden&mimetype=application/xml kalmar-signer.crt http://discovery.shibboleth.net/shibboleth.net-metadata.xml |