From a68a12b04f2d02e2594e9d20c91def37eb8b31f7 Mon Sep 17 00:00:00 2001 From: Leif Johansson <leifj@sunet.se> Date: Tue, 20 Sep 2011 18:01:06 +0200 Subject: renamed mf --- Makefile | 88 +++++++++++++++++++++++++++++++++++------------------- NewMakefile | 89 ------------------------------------------------------- scripts/update.sh | 2 +- 3 files changed, 58 insertions(+), 121 deletions(-) delete mode 100644 NewMakefile diff --git a/Makefile b/Makefile index edd4ee6a..4746ea02 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ -KEY=signer.key -CERT=signer.crt -PASS=$(shell cat /local/swamid-signer-pass.txt) +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 all: update clean sign @@ -10,54 +11,79 @@ update: keys: $(KEY) $(CERT) -sign: keys swamid nya swamid-compat nya-testing swamid-testing swamid-kalmar swamid-edugain-testing swamid-ki-sll +MXML=$(shell echo *.mxml) -urn-mace-swami.se-swamid-test-1.0-metadata.mxml: - @sed 's!http://md.swamid.se/md/swamid-1.0.xml!urn:mace:swami.se:swamid:test-1.0!g' < swamid-1.0.mxml > urn-mace-swami.se-swamid-test-1.0-metadata.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 -swamid-compat: urn-mace-swami.se-swamid-test-1.0-metadata.mxml - @saml-md-tool urn-mace-swami.se-swamid-test-1.0-metadata update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - @test -s urn-mace-swami.se-swamid-test-1.0-metadata-unsigned.xml && cp urn-mace-swami.se-swamid-test-1.0-metadata-unsigned.xml /local/saml-metadata/urn-mace-swami.se-swamid-test-1.0-metadata.xml - @test -s urn-mace-swami.se-swamid-test-1.0-metadata.xml && cp urn-mace-swami.se-swamid-test-1.0-metadata.xml /local/saml-metadata/urn-mace-swami.se-swamid-test-1.0-metadata-signed.xml +swamid-externals: swamid-externals1 swamid-externals2 -swamid: +swamid-externals1: + @scripts/aggregate.sh swamid-externals-1.0 + +swamid-externals2: + @scripts/aggregate.sh swamid-externals-2.0 + +swamid-interfederations: swamid-interfederations1 swamid-interfederations2 + +swamid-interfederations1: + @scripts/aggregate.sh swamid-interfederations-1.0 + +swamid-interfederations2: + @scripts/aggregate.sh swamid-interfederations-2.0 + +swamid: swamid1 swamid2 + +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 /local/saml-metadata - @test -s swamid-1.0-unsigned.xml && cp swamid-1.0-unsigned.xml /local/saml-metadata + @test -s swamid-1.0.xml && cp swamid-1.0.xml $(DEST) + #@test -s swamid-1.0-unsigned.xml && cp swamid-1.0-unsigned.xml $(DEST) + +swamid2: swamid-backport-1.0.xml + @saml-md-tool swamid-2.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) + @test -s swamid-2.0.xml && cp swamid-2.0.xml $(DEST) + +swamid-backport-1.0.xml: + @xsltproc --xinclude xslt/extract-non-idp.xslt swamid-1.0.mxml > swamid-backport-1.0.xml 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 /local/saml-metadata - @test -s nya-1.0-unsigned.xml && cp nya-1.0-unsigned.xml /local/saml-metadata + @test -s nya-1.0.xml && cp nya-1.0.xml $(DEST) + #@test -s nya-1.0-unsigned.xml && cp nya-1.0-unsigned.xml $(DEST) 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 /local/saml-metadata + @test -s nya-1.0-testing.xml && cp nya-1.0-testing.xml $(DEST) swamid-testing: - @saml-md-tool swamid-1.0-testing update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - @test -s swamid-1.0-testing.xml && cp swamid-1.0-testing.xml /local/saml-metadata + @saml-md-tool swamid-testing-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) + @test -s swamid-testing-1.0.xml && cp swamid-testing-1.0.xml $(DEST) + +swamid-testing-idp: + @saml-md-tool swamid-testing-idp-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) + @test -s swamid-testing-idp-1.0.xml && cp swamid-testing-idp-1.0.xml $(DEST) 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 /local/saml-metadata + @test -s swamid-edugain-testing-1.0.xml && cp swamid-edugain-testing-1.0.xml $(DEST) swamid-kalmar: - @saml-md-tool swamid-kalmar-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - @test -s swamid-kalmar-1.0.xml && cp swamid-kalmar-1.0.xml /local/saml-metadata + @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) + +swamid-kalmar-testing: + @saml-md-tool swamid-kalmar-testing-1.0 update --days=2 --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) + @test -s swamid-kalmar-testing-1.0.xml && cp swamid-kalmar-testing-1.0.xml $(DEST) swamid-ki-sll: @saml-md-tool swamid-ki-sll-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - @test -s swamid-ki-sll-1.0.xml && cp swamid-ki-sll-1.0.xml /local/saml-metadata - -test: - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd swamid-1.0.mxml - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd nya-1.0.mxml - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd swamid-1.0-testing.mxml - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd nya-1.0-testing.mxml - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd swamid-kalmar-1.0.mxml - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd swamid-ki-sll-1.0.mxml - @xmllint --xinclude --noout --schema schema/sstc-saml-schema-metadata-2.0.xsd swamid-edugain-testing-1.0.mxml + @test -s swamid-ki-sll-1.0.xml && cp swamid-ki-sll-1.0.xml $(DEST) + +swamid-fiv-test: + @saml-md-tool swamid-fiv-test update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) + @test -s swamid-fiv-test.xml && cp swamid-fiv-test.xml $(DEST) + +test: swamid-backport-1.0.xml + @for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x; done clean: @rm -f *.xml diff --git a/NewMakefile b/NewMakefile deleted file mode 100644 index 4746ea02..00000000 --- a/NewMakefile +++ /dev/null @@ -1,89 +0,0 @@ - -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 - -all: update clean sign - -update: -# @svn up -q - -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 - -swamid-externals: swamid-externals1 swamid-externals2 - -swamid-externals1: - @scripts/aggregate.sh swamid-externals-1.0 - -swamid-externals2: - @scripts/aggregate.sh swamid-externals-2.0 - -swamid-interfederations: swamid-interfederations1 swamid-interfederations2 - -swamid-interfederations1: - @scripts/aggregate.sh swamid-interfederations-1.0 - -swamid-interfederations2: - @scripts/aggregate.sh swamid-interfederations-2.0 - -swamid: swamid1 swamid2 - -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-unsigned.xml && cp swamid-1.0-unsigned.xml $(DEST) - -swamid2: swamid-backport-1.0.xml - @saml-md-tool swamid-2.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - @test -s swamid-2.0.xml && cp swamid-2.0.xml $(DEST) - -swamid-backport-1.0.xml: - @xsltproc --xinclude xslt/extract-non-idp.xslt swamid-1.0.mxml > swamid-backport-1.0.xml - -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-unsigned.xml && cp nya-1.0-unsigned.xml $(DEST) - -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) - -swamid-testing: - @saml-md-tool swamid-testing-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - @test -s swamid-testing-1.0.xml && cp swamid-testing-1.0.xml $(DEST) - -swamid-testing-idp: - @saml-md-tool swamid-testing-idp-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - @test -s swamid-testing-idp-1.0.xml && cp swamid-testing-idp-1.0.xml $(DEST) - -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-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) - -swamid-kalmar-testing: - @saml-md-tool swamid-kalmar-testing-1.0 update --days=2 --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - @test -s swamid-kalmar-testing-1.0.xml && cp swamid-kalmar-testing-1.0.xml $(DEST) - -swamid-ki-sll: - @saml-md-tool swamid-ki-sll-1.0 update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - @test -s swamid-ki-sll-1.0.xml && cp swamid-ki-sll-1.0.xml $(DEST) - -swamid-fiv-test: - @saml-md-tool swamid-fiv-test update --key=$(KEY) --cert=$(CERT) --pwd=$(PASS) - @test -s swamid-fiv-test.xml && cp swamid-fiv-test.xml $(DEST) - -test: swamid-backport-1.0.xml - @for x in $(MXML); do xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $$x; done - -clean: - @rm -f *.xml diff --git a/scripts/update.sh b/scripts/update.sh index 66ffb043..3d8441ac 100644 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -1,3 +1,3 @@ #!/bin/sh -cd /opt/swamid-metadata && git pull && make -f NewMakefile test && make -f NewMakefile +cd /opt/swamid-metadata && git pull && make test && make -- cgit v1.2.3