From ec38f656b0fd3fc68322b4da9c22c767d77f7303 Mon Sep 17 00:00:00 2001
From: Stephen Gran <steve@lobefin.net>
Date: Sun, 20 May 2012 20:09:34 +0100
Subject: [PATCH 1/1] add www_master

Signed-off-by: Stephen Gran <steve@lobefin.net>
---
 modules/debian-org/misc/local.yaml         |  2 ++
 modules/roles/files/www_master/rsyncd.conf | 14 ++++++++++++++
 modules/roles/manifests/init.pp            |  4 ++++
 modules/roles/manifests/www_master.pp      |  6 ++++++
 4 files changed, 26 insertions(+)
 create mode 100644 modules/roles/files/www_master/rsyncd.conf
 create mode 100644 modules/roles/manifests/www_master.pp

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 8f101a48..f31debcd 100644
--- 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
index 00000000..7ff52ac7
--- /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 437a5a50..fbe2d470 100644
--- 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
index 00000000..856721ce
--- /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',
+		}
+
+}
-- 
2.39.2