diff options
| author | Leif Johansson <leifj@sunet.se> | 2016-12-09 15:03:00 +0100 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2016-12-09 15:03:00 +0100 |
| commit | 3ad5ce5f81f34a5cc198d90c6ed873e0803cca52 (patch) | |
| tree | 50938a49dcd57a0eec0f0cf02c811de99ef7d264 | |
| parent | e0bb05832279cc8effcb64cdadb911f9f639e4a8 (diff) | |
| parent | 55d548df24e138507315b504b3405a0d7cbb619c (diff) | |
Merge branch 'master' of md-master.swamid.se:swamid-metadata
| -rwxr-xr-x | scripts/pull-and-verify.sh | 8 | ||||
| -rw-r--r-- | xslt/full-summary.xslt | 2 | ||||
| -rw-r--r-- | xslt/normalize.xsl | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/scripts/pull-and-verify.sh b/scripts/pull-and-verify.sh index 92485214..c375f503 100755 --- a/scripts/pull-and-verify.sh +++ b/scripts/pull-and-verify.sh @@ -9,6 +9,12 @@ URL=$1 DIR=$2 CERT=$3 +if echo "$DIR" | grep -q "mds.swamid.se" ; then + publish_name=mds.swamid.se +else + publish_name=md.swamid.se +fi + TMPF=`mktemp` wget -q --timeout 120 --no-check-certificate -O$TMPF $URL || die "Unable to download $URL: $?" if [ "x$CERT" != "x" ]; then @@ -19,7 +25,7 @@ xsltproc --stringparam output $TMPD xslt/import-metadata.xsl $TMPF || die "Unabl rsync -avz $TMPD/ $DIR ( echo '<?xml version="1.0"?>' -echo "<EntitiesDescriptor xmlns=\"urn:oasis:names:tc:SAML:2.0:metadata\" xmlns:xi=\"http://www.w3.org/2001/XInclude\" Name=\"http://md.swamid.se/md/$DIR.xml\">" +echo "<EntitiesDescriptor xmlns=\"urn:oasis:names:tc:SAML:2.0:metadata\" xmlns:xi=\"http://www.w3.org/2001/XInclude\" Name=\"http://$publish_name/md/$DIR.xml\">" T=`mktemp` for md in $DIR/*.xml; do xsltproc xslt/clean-entitydescriptor.xsl $md > $T && mv $T $md diff --git a/xslt/full-summary.xslt b/xslt/full-summary.xslt index 025a705c..bf127dfa 100644 --- a/xslt/full-summary.xslt +++ b/xslt/full-summary.xslt @@ -9,7 +9,7 @@ extension-element-prefixes="exsl" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"> - <xsl:import href="http://md.swamid.se/xslt/summary.xslt"/> + <xsl:import href="http://mds.swamid.se/xslt/summary.xslt"/> <xsl:template match="/md:EntitiesDescriptor"> <xsl:apply-templates select="md:EntityDescriptor"/> diff --git a/xslt/normalize.xsl b/xslt/normalize.xsl index 56a32d75..0886feef 100644 --- a/xslt/normalize.xsl +++ b/xslt/normalize.xsl @@ -25,8 +25,8 @@ You as contractual obligations. The SWAMID Metadata Terms of Access and Use can be found here: -- http://md.swamid.se/md/swamid-tou-sv.txt Swedish version - Legally Binding! -- http://md.swamid.se/md/swamid-tou-en.txt English version - Non-normative translation +- http://mds.swamid.se/md/swamid-tou-sv.txt Swedish version - Legally Binding! +- http://mds.swamid.se/md/swamid-tou-en.txt English version - Non-normative translation If You do not accept these Terms, then You must not continue to use this Metadata. |