rsync for wiki

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 12dcc528a86dc05142b48bc92f381d2e07a8d65f..f962b72bc9737a71a67696a11adeb04a5b922e6c 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -190,6 +190,8 @@ services:
     - wolkenstein.debian.org
   keyring:
     - kaufmann.debian.org
+  wiki:
+    - wilder.debian.org
   # new style porterbox (schroot, dd installable packages etc)
   porterbox:
     # once they are all on new-style, we can use ldap for this

diff --git a/modules/roles/files/wiki/rsyncd.conf b/modules/roles/files/wiki/rsyncd.conf
new file mode 100644 (file)
index 0000000..8b65a71
--- /dev/null
+++ b/modules/roles/files/wiki/rsyncd.conf
@@ -0,0 +1,12 @@
+uid = nobody
+gid = nogroup
+max connections = 25
+syslog facility = daemon
+log file = /var/log/rsyncd/rsyncd.log
+socket options = SO_KEEPALIVE
+timeout = 7200
+
+[wiki.debian.org-dump]
+  path = /srv/wiki.debian.org/var/moin/dump
+  comment = Dump of wiki.debian.org
+  read only = true

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index fad6b087a436751f643a1ef183d5263ec6fb78dd..d5340689762e4d0df75023aa45cc6489ff4afa9a 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -58,6 +58,10 @@ class roles {
                include roles::keyring
        }
 
+       if getfromhash($site::nodeinfo, 'wiki') {
+               include roles::wiki
+       }
+
        if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
                include roles::ftp-upcoming_mirror
        }

diff --git a/modules/roles/manifests/wiki.pp b/modules/roles/manifests/wiki.pp
new file mode 100644 (file)
index 0000000..4cb52ab
--- /dev/null
+++ b/modules/roles/manifests/wiki.pp
@@ -0,0 +1,5 @@
+class roles::wiki {
+       rsync::site { 'wiki':
+               source => 'puppet:///modules/roles/wiki/rsyncd.conf',
+       }
+}