summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2011-11-03 12:39:15 +0100
committerLeif Johansson <leifj@sunet.se>2011-11-03 12:39:15 +0100
commit7a623b288b7421f7a3d712c0ea3f2a60cc06b2e0 (patch)
tree161d061478f64a312f5a01783fad5e82be1bb361
parent398be5e05934a050850ff4f0a4782ae1f55bc1ed (diff)
removed the combined part of the name which is just surpurflous
-rw-r--r--Makefile8
-rw-r--r--swamid-idp.mxml (renamed from swamid-idp-combined.mxml)0
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 9a2b0a50..7dc472a7 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ swamid-interfederations1:
swamid-interfederations2:
@scripts/aggregate.sh swamid-interfederations-2.0
-swamid: swamid1 swamid2 swamid-no-interfederation-combined swamid-idp-combined
+swamid: swamid1 swamid2 swamid-no-interfederation-combined swamid-idp
swamid1:
@saml-md-tool swamid-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
@@ -60,9 +60,9 @@ swamid-no-interfederation-combined: swamid2-deps
@saml-md-tool swamid-no-interfederation-combined update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS)
@test -s swamid-no-interfederation-combined.xml && cp swamid-no-interfederation-combined.xml $(DEST)
-swamid-idp-combined: swamid2-deps
- @saml-md-tool swamid-idp-combined update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS)
- test -s swamid-idp-combined.xml && cp swamid-idp-combined.xml $(DEST)
+swamid-idp: swamid2-deps
+ @saml-md-tool swamid-idp update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) --days=$(DAYS)
+ test -s swamid-idp.xml && cp swamid-idp.xml $(DEST)
nya:
@saml-md-tool nya-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS)
diff --git a/swamid-idp-combined.mxml b/swamid-idp.mxml
index f82fd40d..f82fd40d 100644
--- a/swamid-idp-combined.mxml
+++ b/swamid-idp.mxml