From: Stephen Gran Date: Thu, 17 May 2012 07:11:45 +0000 (+0100) Subject: add bugs_search X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=59a2cc3e48fbcae69ea87ed198e46d6b8a6859c8 add bugs_search Signed-off-by: Stephen Gran --- diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 60e4645c..8f101a48 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -147,6 +147,8 @@ services: bugsmaster: bugsmx: - busoni.debian.org + bugs_search: + - glinka.debian.org dbmaster: - draghi.debian.org ftp_master: diff --git a/modules/roles/files/bugs_search/rsyncd.conf b/modules/roles/files/bugs_search/rsyncd.conf new file mode 100644 index 00000000..008e1b12 --- /dev/null +++ b/modules/roles/files/bugs_search/rsyncd.conf @@ -0,0 +1,29 @@ +uid = nobody +gid = nogroup +max connections = 20 +syslog facility = daemon +socket options = SO_KEEPALIVE +timeout = 7200 +log file = /var/log/rsyncd/rsyncd.log + +[bts-spool-db] + comment = [bugs-mirror.debian.org] active bug spool + path = /srv/bugs.debian.org/spool/db-h + read only = true + +[bts-spool-archive] + comment = [bugs-mirror.debian.org] archived bug spool + path = /srv/bugs.debian.org/spool/archive + read only = true + +[bts-spool-index] + comment = [bugs-mirror.debian.org] bug index files + path = /srv/bugs.debian.org/spool + exclude = db-h archive + read only = true + +[bts-versions] + comment = [bugs-mirror.debian.org] bts package version information + path = /srv/bugs.debian.org/versions + exclude = archive cl-data lock queue bin + read only = true diff --git a/modules/roles/manifests/bugs_search.pp b/modules/roles/manifests/bugs_search.pp new file mode 100644 index 00000000..9be0a9c7 --- /dev/null +++ b/modules/roles/manifests/bugs_search.pp @@ -0,0 +1,7 @@ +class roles::bugs_search { + + rsync::site { 'bugs_search': + source => 'puppet:///modules/roles/bugs_search/rsyncd.conf', + max_clients => 100, + } +} diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index d4bc6834..437a5a50 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -16,6 +16,10 @@ class roles { include buildd } + if getfromhash($site::nodeinfo, 'bugs_search') { + include roles::bugs_search + } + if getfromhash($site::nodeinfo, 'ftp_master') { include roles::ftp_master include roles::dakmaster