From 379bd17e12aeac2561c891b018ca8017a4b121ed Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 29 Jul 2011 16:23:21 +0200
Subject: [PATCH] ftp-upcoming

---
 .../sites-available/ftp-upcoming.debian.org     | 16 ++++++++++++++++
 .../apache2/manifests/ftp-upcoming_mirror.pp    | 17 +++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 modules/apache2/files/common/etc/apache2/sites-available/ftp-upcoming.debian.org
 create mode 100644 modules/apache2/manifests/ftp-upcoming_mirror.pp

diff --git a/modules/apache2/files/common/etc/apache2/sites-available/ftp-upcoming.debian.org b/modules/apache2/files/common/etc/apache2/sites-available/ftp-upcoming.debian.org
new file mode 100644
index 00000000..24e6fa0d
--- /dev/null
+++ b/modules/apache2/files/common/etc/apache2/sites-available/ftp-upcoming.debian.org
@@ -0,0 +1,16 @@
+##
+## 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
+##
+
+<VirtualHost *:80>
+   ServerAdmin ftpmaster@debian.org
+   DocumentRoot /srv/mirrors/buildd-all
+   ServerName ftp-upcoming.debian.org
+
+   ErrorLog /var/log/apache2/ftp-upcoming.debian.org-error.log
+   LogLevel warn
+   CustomLog /var/log/apache2/ftp-upcoming.debian.org-access.log combined
+
+   IndexOptions FancyIndexing NameWidth=*
+</VirtualHost>
diff --git a/modules/apache2/manifests/ftp-upcoming_mirror.pp b/modules/apache2/manifests/ftp-upcoming_mirror.pp
new file mode 100644
index 00000000..66a9cce2
--- /dev/null
+++ b/modules/apache2/manifests/ftp-upcoming_mirror.pp
@@ -0,0 +1,17 @@
+class apache2::ftp-upcoming_mirror inherits apache2 {
+    file {
+        "/etc/apache2/sites-available/ftp-upcoming.debian.org":
+            source  => [ "puppet:///modules/apache2/per-host/$fqdn/etc/apache2/sites-available/ftp-upcoming.debian.org",
+                         "puppet:///modules/apache2/common/etc/apache2/sites-available/ftp-upcoming.debian.org" ];
+
+    }
+
+    activate_apache_site {
+        "010-ftp-upcoming.debian.org": site => "ftp-upcoming.debian.org";
+    }
+
+}
+
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4:
-- 
2.39.2