add www_master

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 8f101a482b72ad001ef890a016b621770e25714c..f31debcd7c718bd749ce437c58c510fa7e76bd0f 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -175,6 +175,8 @@ services:
     - reger.debian.org
   security_master:
     - chopin.debian.org
+  www_master:
+    - wolkenstein.debian.org
 host_settings:
   heavy_exim:
     - bellini.debian.org

diff --git a/modules/roles/files/www_master/rsyncd.conf b/modules/roles/files/www_master/rsyncd.conf
new file mode 100644 (file)
index 0000000..7ff52ac
--- /dev/null
+++ b/modules/roles/files/www_master/rsyncd.conf
@@ -0,0 +1,14 @@
+uid = nobody
+gid = nogroup
+max connections = 20
+syslog facility = daemon
+socket options = SO_KEEPALIVE
+timeout = 7200
+log file = /var/log/rsyncd/rsyncd.log
+
+[web.debian.org]
+       path = /srv/www.debian.org/www
+       comment = Debian Web Site
+       auth users = *
+       read only = true
+       secrets file = /etc/rsyncd/www.secrets

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 437a5a508df606b1d8bd0f31e0998af27d5f5a0e..fbe2d47048a9ce66b1eb27d350e7987fd28a31d7 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -55,6 +55,10 @@ class roles {
                include roles::dakmaster
        }
 
+       if getfromhash($site::nodeinfo, 'www_master') {
+               include roles::www_master
+       }
+
        if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
                include roles::ftp-upcoming_mirror
        }

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