From c5f18085f190a97daee0c16dbfec78f4e32a96ee Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 29 Aug 2017 10:17:19 +0200
Subject: [PATCH] maintain /srv/keyring.debian.org tree in puppet

---
 modules/roles/manifests/init.pp               |  4 ++++
 .../manifests/keyring_debian_org_mirror.pp    | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 modules/roles/manifests/keyring_debian_org_mirror.pp

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index dec4470a8..ab1f69693 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -326,4 +326,8 @@ class roles {
 	if has_role('bacula_storage') {
 		include bacula::storage
 	}
+
+	if $::keyring_debian_org_mirror {
+		include roles::keyring_debian_org_mirror
+	}
 }
diff --git a/modules/roles/manifests/keyring_debian_org_mirror.pp b/modules/roles/manifests/keyring_debian_org_mirror.pp
new file mode 100644
index 000000000..ca3c633be
--- /dev/null
+++ b/modules/roles/manifests/keyring_debian_org_mirror.pp
@@ -0,0 +1,22 @@
+class roles::keyring_debian_org_mirror {
+	file { '/srv/keyring.debian.org/keyrings':
+		ensure => 'directory'
+	}
+	file { '/srv/keyring.debian.org/keyrings/debian-keyring.gpg':
+		ensure => 'link',
+		target => '/var/lib/misc/thishost/debian-keyring.gpg'
+	}
+	file { '/srv/keyring.debian.org/keyrings/debian-maintainers.gpg':
+		ensure => 'link',
+		target => '/var/lib/misc/thishost/debian-maintainers.gpg'
+	}
+	file { '/srv/keyring.debian.org/keyrings/debian-nonupload.gpg':
+		ensure => 'link',
+		target => '/var/lib/misc/thishost/debian-nonupload.gpg'
+	}
+
+	file { '/srv/keyring.debian.org/keyrings/buildd-keyrings':
+		ensure => 'link',
+		target => '/var/lib/misc/thishost/buildd-keyrings'
+	}
+}
-- 
2.20.1