new edugain upstream and swamid readme

3 files changed, 64 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 7dc472a7..3a48d2cd 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ keys: $(KEY) $(CERT)
 
 MXML=$(shell echo *.mxml)
 
-sign: keys swamid nya nya-testing swamid-testing swamid-testing-idp swamid-kalmar swamid-kalmar-testing swamid-edugain-testing swamid-ki-sll swamid-fiv-test
+sign: keys swamid nya nya-testing swamid-testing swamid-testing-idp swamid-kalmar swamid-kalmar-testing swamid-edugain-testing swamid-edugain swamid-ki-sll swamid-fiv-test
 
 swamid-externals: swamid-externals1 swamid-externals2
 
@@ -32,7 +32,10 @@ swamid-interfederations1:
 swamid-interfederations2:
 	@scripts/aggregate.sh swamid-interfederations-2.0
 
-swamid: swamid1 swamid2 swamid-no-interfederation-combined swamid-idp
+swamid: swamid1 swamid2 swamid-no-interfederation-combined swamid-idp publish
+
+publish: swamid-tou-en.txt swamid-tou-sv.txt README
+	cp swamid-tou-en.txt swamid-tou-sv.txt README $(DEST)
 
 swamid1:
 	@saml-md-tool swamid-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
@@ -84,6 +87,10 @@ swamid-edugain-testing:
 	@saml-md-tool swamid-edugain-testing-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
 	@test -s swamid-edugain-testing-1.0.xml && cp swamid-edugain-testing-1.0.xml $(DEST)
 
+swamid-testing:
+	@saml-md-tool swamid-edugain-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
+	@test -s swamid-edugain-1.0.xml && cp swamid-edugain-1.0.xml $(DEST
+
 swamid-kalmar:
 	@saml-md-tool swamid-kalmar-1.0 update --days=2 --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
 	@test -s swamid-kalmar-1.0.xml && cp swamid-kalmar-1.0.xml $(DEST)
diff --git a/README b/README
new file mode 100644
index 00000000..c1d5288e
--- /dev/null
+++ b/README
@@ -0,0 +1,47 @@
+NOTW WELL The contents of this directory is explained in detail at www.swamid.se.
+
+All files with names containing test or testing are for test use only. These
+are *not for production*.
+
+md-signer.crt			The SWAMID signing certificate
+
+* Production Metadata 
+
+These are metadata feeds to be consumed by SWAMID members and relying parties.
+
+swamid-1.0			SWAMID version 1.0 main metadata feed
+swamid-2.0                      SWAMID version 2.0 main metadata feed
+swamid-idp			Aggregate of all SWAMID 1.0 and 2.0 and SWAMID 
+				interfederation IdPs
+
+* Interfederation upstream
+
+These are feeds that are consumed by interfederation aggregators such as Kalmar2
+or eduGAIN. These should not be consumed by anyone except the relevant federation
+operator.
+
+swamid-kalmar-1.0               Production Kalmar upstream
+swamid-edugain-1.0		Production eduGAIN upstream
+
+* Tests
+
+Only for testing
+
+swamid-edugain-testing-1.0      Test edugain testing upstream
+swamid-kalmar-testing-1.0       Testing Kalmar upstream
+
+* Special-purpose
+
+Special projects and PoCs
+
+swamid-ki-sll-1.0               Production KI-SLL interfederation
+swamid-fiv-test                 Test Federation i Väst upstream
+swamid-no-interfederation-combined
+				Aggregate of all SWAMID 1.0 and 2.0 SPs and IdPs excluding 
+                                any interfederation IdPs. Only for use in SWAMID discovery 
+				services
+
+* Deprecated
+
+nya-1.0 and nya-1.0-testing     NyA federation for VHS.se *DEPRECATED*
+
diff --git a/swamid-edugain-1.0.mxml b/swamid-edugain-1.0.mxml
new file mode 100644
index 00000000..d5e5e25d
--- /dev/null
+++ b/swamid-edugain-1.0.mxml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<md:EntitiesDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-kalmar-1.0.xml" validUntil="1970-01-01T00:00:00Z" cacheDuration="PT2H">
+  <xi:include href="swamid-1.0/connect.sunet.se.xml"/>
+  <xi:include href="swamid-1.0/sp.swamid.se.xml"/>
+  <xi:include href="swamid-1.0/idp.nordu.net.xml"/>
+  <xi:include href="swamid-1.0/sp-test.swamid.se.xml"/>
+  <xi:include href="swamid-1.0/swamid.user.uu.se.xml"/>
+</md:EntitiesDescriptor>