From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 22 Jun 2012 18:32:19 +0000 (+0200)
Subject: http://bugs-mirror.d.o should not work
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7213fa6c65577890add1165f3e7c0eb190f39ecb;p=mirror%2Fdsa-puppet.git

http://bugs-mirror.d.o should not work
---

diff --git a/modules/roles/files/bugs_mirror/bugs-mirror.debian.org b/modules/roles/files/bugs_mirror/bugs-mirror.debian.org
new file mode 100644
index 000000000..10ff4ef63
--- /dev/null
+++ b/modules/roles/files/bugs_mirror/bugs-mirror.debian.org
@@ -0,0 +1,21 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+# bugs-mirror is an rsync service, not a web service
+
+<VirtualHost *:80>
+	ServerName bugs-mirror.debian.org
+	ServerAdmin debian-admin@debian.org
+
+	ErrorLog /var/log/apache2/bugs-mirror.debian.org-error.log
+	CustomLog /var/log/apache2/bugs-mirror.debian.org-access.log combined
+
+	<IfModule mod_userdir.c>
+		UserDir disabled
+	</IfModule>
+
+	Redirect permanent / http://bugs.debian.org/
+</VirtualHost>
+# vim:set syn=apache:
diff --git a/modules/roles/manifests/bugs_mirror.pp b/modules/roles/manifests/bugs_mirror.pp
index 4d03a9aee..f6e1f2af0 100644
--- a/modules/roles/manifests/bugs_mirror.pp
+++ b/modules/roles/manifests/bugs_mirror.pp
@@ -4,4 +4,12 @@ class roles::bugs_mirror {
 		source      => 'puppet:///modules/roles/bugs_mirror/rsyncd.conf',
 		max_clients => 100,
 	}
+
+	if $::apache2 {
+		apache2::site { '009-bugs-mirror.debian.org':
+			site   => 'bugs-mirror.debian.org',
+			source => 'puppet:///modules/roles/bugs_mirror/bugs-mirror.debian.org',
+		}
+	}
+
 }