From 98293f6fb4e156b3c2f42024adec5d332c056bcf Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 22 Jun 2012 20:24:24 +0200 Subject: [PATCH] bugs_search -> bugs_mirror --- modules/debian-org/misc/local.yaml | 2 +- .../roles/files/{bugs_search => bugs_mirror}/rsyncd.conf | 0 modules/roles/manifests/bugs_mirror.pp | 7 +++++++ modules/roles/manifests/bugs_search.pp | 7 ------- modules/roles/manifests/init.pp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) rename modules/roles/files/{bugs_search => bugs_mirror}/rsyncd.conf (100%) create mode 100644 modules/roles/manifests/bugs_mirror.pp delete mode 100644 modules/roles/manifests/bugs_search.pp diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index 30bb5f11f..c8dd6e8b2 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -152,7 +152,7 @@ services: bugsmaster: bugsmx: - busoni.debian.org - bugs_search: + bugs_mirror: - glinka.debian.org dbmaster: - draghi.debian.org diff --git a/modules/roles/files/bugs_search/rsyncd.conf b/modules/roles/files/bugs_mirror/rsyncd.conf similarity index 100% rename from modules/roles/files/bugs_search/rsyncd.conf rename to modules/roles/files/bugs_mirror/rsyncd.conf diff --git a/modules/roles/manifests/bugs_mirror.pp b/modules/roles/manifests/bugs_mirror.pp new file mode 100644 index 000000000..4d03a9aee --- /dev/null +++ b/modules/roles/manifests/bugs_mirror.pp @@ -0,0 +1,7 @@ +class roles::bugs_mirror { + + rsync::site { 'bugs_mirror': + source => 'puppet:///modules/roles/bugs_mirror/rsyncd.conf', + max_clients => 100, + } +} diff --git a/modules/roles/manifests/bugs_search.pp b/modules/roles/manifests/bugs_search.pp deleted file mode 100644 index 9be0a9c72..000000000 --- a/modules/roles/manifests/bugs_search.pp +++ /dev/null @@ -1,7 +0,0 @@ -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 a8f745ab1..647f4576a 100644 --- a/modules/roles/manifests/init.pp +++ b/modules/roles/manifests/init.pp @@ -16,8 +16,8 @@ class roles { include buildd } - if getfromhash($site::nodeinfo, 'bugs_search') { - include roles::bugs_search + if getfromhash($site::nodeinfo, 'bugs_mirror') { + include roles::bugs_mirror } if getfromhash($site::nodeinfo, 'ftp_master') { -- 2.20.1