diff options
| -rw-r--r-- | HEADER.html | 7 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | README.html | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/HEADER.html b/HEADER.html index 7151e941..e8649661 100644 --- a/HEADER.html +++ b/HEADER.html @@ -15,10 +15,9 @@ These are metadata feeds to be consumed by SWAMID members and relying parties: </p> <dl> -<dt><b>swamid-1.0</b></dt><dd>SWAMID version 1.0 main metadata feed.</dd> -<dt><b>swamid-2.0</b></dt><dd>SWAMID version 2.0 main metadata feed. If you are switching over to SWAMID 2.0 you may want to keep both swamid-1.0 and swamid-2.0 loaded at the same time.</dd> -<dt><b>swamid-idp</b></dt><dd>Aggregate of all SWAMID 1.0 and 2.0 registered identity providers. This is intended to be used by relying parties (SPs) who want to be able to communicate with identity providers in the <b>local</b> SWAMID ring of trust.</dd> -<dt><b>swamid-idp-transitive</b></dt><dd>Aggregate of all SWAMID 1.0 and 2.0 and SWAMID interfederation identity providers. This is intended to be used by relying parties (SPs) who want to be able to communicate with the full set of identity providers in the <b>full transitive</b> SWAMID ring of trust.</dd> +<dt><b>swamid-2.0</b></dt><dd>SWAMID version 2.0 main metadata feed.</dd> +<dt><b>swamid-idp</b></dt><dd>Aggregate of all SWAMID 2.0 registered identity providers. This is intended to be used by relying parties (SPs) who want to be able to communicate with identity providers in the <b>local</b> SWAMID ring of trust.</dd> +<dt><b>swamid-idp-transitive</b></dt><dd>Aggregate of all SWAMID 2.0 and SWAMID interfederation identity providers. This is intended to be used by relying parties (SPs) who want to be able to communicate with the full set of identity providers in the <b>full transitive</b> SWAMID ring of trust.</dd> <dt><b>swamid-discovery</b></dt><dd>All IdPs and SPs excluding all interfederation IdPs. Only for use with discovery services.</dd> </dl> @@ -46,7 +46,8 @@ edugain: $(MAKE) RPI=true CONTACTS=true swamid-edugain-testing-1.0.pub swamid-edugain-1.0.pub nocache: - $(MAKE) swamid-1.0-nocache.pub + #$(MAKE) swamid-1.0-nocache.pub + rm -f $(DEST)/swamid-1.0-nocache.xml projects: $(MAKE) RPI=false CONTACTS=false TOU=false ORG=false swamid-fiv-test.pub @@ -76,7 +77,8 @@ publish: swamid-tou-en.txt swamid-tou-sv.txt HEADER.html README.html swamid1: @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) + #@test -s swamid-1.0.xml && cp swamid-1.0.xml $(DEST) + rm -f $(DEST)/swamid-1.0.xml swamid2-deps: swamid-sp-1.0.xml swamid-idp-1.0.xml swamid-externals-sp-2.0.xml swamid-interfederations-idp-2.0.xml @@ -114,11 +116,13 @@ swamid-idp-transitive: swamid2-deps nya: @saml-md-tool nya-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - @test -s nya-1.0.xml && cp nya-1.0.xml $(DEST) + #@test -s nya-1.0.xml && cp nya-1.0.xml $(DEST) + rm -f $(DEST)/nya-1.0.xml nya-testing: @saml-md-tool nya-1.0-testing update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - @test -s nya-1.0-testing.xml && cp nya-1.0-testing.xml $(DEST) + #@test -s nya-1.0-testing.xml && cp nya-1.0-testing.xml $(DEST) + rm -f $(DEST)/nya-1.0-testing.xml swamid-testing: @saml-md-tool swamid-testing-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) diff --git a/README.html b/README.html index 282303bb..4aae6673 100644 --- a/README.html +++ b/README.html @@ -27,5 +27,5 @@ <h2>Deprecated</h2> -<p><b>Do not use</b>:swamid-no-interfederation-combined-1.0.xml, nya-1.0 and nya-1.0-testing</p> +<p><b>Do not use</b>:swamid-no-interfederation-combined-1.0.xml</p> </div> |