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 f31debcd7c718bd749ce437c58c510fa7e76bd0f..02c0aede91739fe604fefdc4f70592d146b04ecb 100644 (file)
--- 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 (file)
index 0000000..e97db76
--- /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 fbe2d47048a9ce66b1eb27d350e7987fd28a31d7..a8f745ab1dddcb2596c3cce4311a239c6acf4efc 100644 (file)
--- 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 (file)
index 0000000..eb40c83
--- /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',
+       }
+}