From: Stephen Gran <steve@lobefin.net>
Date: Sun, 20 May 2012 19:13:41 +0000 (+0100)
Subject: add keyring
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=02b706b6a3a4660bc98181c05d81671878cd8557;hp=ec38f656b0fd3fc68322b4da9c22c767d77f7303;p=dsa-puppet.git

add keyring

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index f31debcd..02c0aede 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -177,6 +177,8 @@ services:
     - chopin.debian.org
   www_master:
     - wolkenstein.debian.org
+  keyring:
+    - kaufmann.debian.org
 host_settings:
   heavy_exim:
     - bellini.debian.org
diff --git a/modules/roles/files/keyring/rsyncd.conf b/modules/roles/files/keyring/rsyncd.conf
new file mode 100644
index 00000000..e97db762
--- /dev/null
+++ b/modules/roles/files/keyring/rsyncd.conf
@@ -0,0 +1,14 @@
+uid = nobody
+gid = nogroup
+max connections = 25
+syslog facility = daemon
+log file = /var/log/rsyncd/rsyncd.log
+socket options = SO_KEEPALIVE
+timeout = 7200
+
+[keyrings]
+  path = /org/keyring.debian.org/pub
+  exclude = keyrings-new/incoming/
+  comment = Debian Keyrings
+  read only = true
+
diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index fbe2d470..a8f745ab 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -59,6 +59,10 @@ class roles {
 		include roles::www_master
 	}
 
+	if getfromhash($site::nodeinfo, 'keyring') {
+		include roles::keyring
+	}
+
 	if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
 		include roles::ftp-upcoming_mirror
 	}
diff --git a/modules/roles/manifests/keyring.pp b/modules/roles/manifests/keyring.pp
new file mode 100644
index 00000000..eb40c83a
--- /dev/null
+++ b/modules/roles/manifests/keyring.pp
@@ -0,0 +1,5 @@
+class roles::keyring {
+	rsync::site { 'keyring':
+		source => 'puppet:///modules/roles/keyring/rsyncd.conf',
+	}
+}