Use keyring.debian.org::keyrings instead of a submodule

diff --git a/.gitignore b/.gitignore
index 962f7ebc49411feb83fff6b42e627c14902ebe7b..3c24c59ac70c6e0918ead1dedb1d98b669be7bf0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ tmp
 /www
 build-area
 puppet/modules
+keyrings

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644 (file)
index 7fb7a92..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,5 +0,0 @@
-[submodule "keyring"]
-       path = keyring
-  #url = git://anonscm.debian.org/keyring/keyring.git
-  url = https://salsa.debian.org/debian-keyring/keyring.git
-  ignore = dirty

diff --git a/Makefile b/Makefile
index 1211f93c24d2d9433c4eb044e3e05aabc6551875..8da8402b5bc5f6dda117547205721d98731b9f0e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,10 +14,16 @@
 #  Place - Suite 330, Boston, MA 02111-1307, USA
 #
 
+.PHONY: keyring
+
 web:
        @ikiwiki --setup ikiwiki.setup
 
 web_deploy:
        @rsync -avz --delete --exclude=keyring www/ debian:/var/sites/debian/www/
 
+keyring:
+       @rsync -az --progress keyring.debian.org::keyrings/ keyrings/
+       @gpg --verify keyrings/sha512sums.txt
+
 publish: web web_deploy

diff --git a/keyring b/keyring
deleted file mode 160000 (submodule)
index def80e6..0000000
--- a/keyring
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit def80e60760843b7afe223c52e15503551a50dd7