From 209639c80fb9131cd37ea91c6c6a2cf026fd99e6 Mon Sep 17 00:00:00 2001
From: Leif Johansson <leifj@sunet.se>
Date: Fri, 23 Sep 2011 15:37:55 +0200
Subject: validUntil and cacheDuration for swamid-2.0.xml

---
 Makefile        | 3 ++-
 swamid-2.0.mxml | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2d641686..f8c2d9ba 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ KEY=/opt/swamid-credentials/swamid-signer.key
 CERT=/opt/swamid-credentials/swamid-signer.crt
 PASS=$(shell cat /opt/swamid-credentials/swamid-signer-pass.txt)
 DEST=/opt/published-metadata
+DAYS=1
 
 all: update clean sign
 
@@ -41,7 +42,7 @@ swamid1:
 swamid2-deps: swamid-backport-1.0.xml swamid-externals-sp-2.0.xml
 
 swamid2: swamid2-deps
-	@saml-md-tool swamid-2.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@saml-md-tool swamid-2.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS)
 	@test -s swamid-2.0.xml && cp swamid-2.0.xml $(DEST)
 
 swamid-backport-1.0.xml:
diff --git a/swamid-2.0.mxml b/swamid-2.0.mxml
index 5d62124d..c2216a85 100644
--- a/swamid-2.0.mxml
+++ b/swamid-2.0.mxml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" 
                     xmlns:xi="http://www.w3.org/2001/XInclude" 
+                    validUntil="1970-01-01T00:00:00Z" cacheDuration="PT8H"
                     Name="http://md.swamid.se/md/swamid-2.0.xml">
 
   <!--
-- 
cgit v1.2.3