Merge branch 'master' of git.swamid.se:swamid-metadataHEADmd-2025-02-27-v01master

1 files changed, 15 insertions, 7 deletions

diff --git a/metadata/scripts/update-and-validate.sh b/metadata/scripts/update-and-validate.sh
index 86d5da33..9e3aa169 100755
--- a/metadata/scripts/update-and-validate.sh
+++ b/metadata/scripts/update-and-validate.sh
@@ -9,29 +9,37 @@ update()
 	ls swamid-edugain/*.xml swamid-2.0/*.xml | sed 's@swamid-.*/\(.*\).xml@.time/\1.validate@' | sort > /tmp/$$.xml
 	ls .time/*.validate > /tmp/$$.time
 	comm -13 /tmp/$$.xml /tmp/$$.time | while read file; do
-		docker exec swamid-metadata-sp /var/www/scripts/removeEntity.bash /opt/metadata/$file
+		docker exec ${CONTAINER} /var/www/scripts/removeEntity.bash /opt/metadata/$file
 	done
 	rm /tmp/$$.xml /tmp/$$.time
 
 	# Update/Import "new" xml-files
-	make -f Makefile.validate -s
+	make -f ${MAKE} -s
 
 	# Revalidate entities in prod not validated for the last nr of days
-	docker exec swamid-metadata-sp php /var/www/scripts/revalidate.php 14 10
+	docker exec ${CONTAINER} php /var/www/scripts/revalidate.php 14 10
 
 	# check URL:s 
-	docker exec swamid-metadata-sp php /var/www/scripts/checkURLs.php
+	docker exec ${CONTAINER} php /var/www/scripts/checkURLs.php
 
 	# update TestResults from release-check -> DB
-	docker exec swamid-metadata-sp php /var/www/scripts/updateTestResults.php
+	docker exec ${CONTAINER} php /var/www/scripts/updateTestResults.php
 
 	# Cleanup Pending-queue
-	docker exec swamid-metadata-sp php /var/www/scripts/cleanupPending.php
+	docker exec ${CONTAINER} php /var/www/scripts/cleanupPending.php
 
 	# to be able to show non-swamid entities on web-page
 	wget -qO swamid-2.0.xml https://mds.swamid.se/md/swamid-2.0.xml
-	docker exec swamid-metadata-sp php /var/www/scripts/updateExternalEntities.php
+	docker exec ${CONTAINER} php /var/www/scripts/updateExternalEntities.php
 }
 
+CONTAINER="swamid-metadata-sp"
+MAKE="Makefile.validate"
+
+if [ "$(lsb_release -i -s)" = "Debian" ]; then
+  CONTAINER="metadata-sp-metadata-sp-1"
+  MAKE="Makefile.validate-debian"
+fi
+
 cd /opt/metadata || exit 1
 update