summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2016-11-16 09:53:25 +0100
committerLeif Johansson <leifj@sunet.se>2016-11-16 09:53:25 +0100
commit67335e4c6acf49385e672f864f989d5f560c4307 (patch)
tree893905d490414530e9828aa934759d9675b2258f
parentd758f44c77c243c5bd8a011b24a3689c8ff5a74e (diff)
run two publication flows in sequence
-rwxr-xr-xscripts/update-cron.sh8
-rw-r--r--swamid2007.mk1
-rw-r--r--swamid2016.mk1
3 files changed, 8 insertions, 2 deletions
diff --git a/scripts/update-cron.sh b/scripts/update-cron.sh
index 3c387f7b..a514b65b 100755
--- a/scripts/update-cron.sh
+++ b/scripts/update-cron.sh
@@ -10,9 +10,13 @@ update()
make aggregate || return $?
echo
- echo "make"
- make || return $?
+ echo "make (2007)"
+ env SWAMID_MK_CONFIG=swamid2007 make || return $?
echo
+
+ echo "make (2016)"
+ env SWAMID_MK_CONFIG=swamid2016 make || return $?
+ echo
}
cd /opt/swamid-metadata || exit 1
diff --git a/swamid2007.mk b/swamid2007.mk
index 50f17b76..21bd58c1 100644
--- a/swamid2007.mk
+++ b/swamid2007.mk
@@ -1,2 +1,3 @@
SIGNER := xmlsign -k http://swamid-hsmproxy.docker:8000/swamid/swamid -c /opt/swamid-credentials/swamid-signer.crt
DEST := /opt/published-metadata/md.swamid.se
+BASEURL:= http://md.swamid.se/md
diff --git a/swamid2016.mk b/swamid2016.mk
index 4d9790c1..c74427a4 100644
--- a/swamid2016.mk
+++ b/swamid2016.mk
@@ -1,2 +1,3 @@
SIGNER := xmlsign -k http://swamid-hsmproxy.docker:8000/swamid/swamid -c /opt/swamid-credentials/swamid-signer.crt
DEST := /opt/published-metadata/mds.swamid.se
+BASEURL:= http://mds.swamid.se/md