From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 22 Jun 2012 18:24:24 +0000 (+0200)
Subject: bugs_search -> bugs_mirror
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=98293f6fb4e156b3c2f42024adec5d332c056bcf;p=mirror%2Fdsa-puppet.git

bugs_search -> bugs_mirror
---

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_mirror/rsyncd.conf b/modules/roles/files/bugs_mirror/rsyncd.conf
new file mode 100644
index 000000000..008e1b12f
--- /dev/null
+++ b/modules/roles/files/bugs_mirror/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/files/bugs_search/rsyncd.conf b/modules/roles/files/bugs_search/rsyncd.conf
deleted file mode 100644
index 008e1b12f..000000000
--- a/modules/roles/files/bugs_search/rsyncd.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-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_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') {