[dak/master] Change how we generate incoming.debian.org

[Mark Hymers <mhy@debian.org>]

Signed-off-by: Mark Hymers <mhy@debian.org>
---
 config/debian/common |   11 ++++++++++-
 config/debian/vars   |    2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/config/debian/common b/config/debian/common
index 606f614..5eec32c 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -36,13 +36,22 @@ function make_buildd_dir () {
     local overridesuite
     local suite
 
+    # We generate straight into the static mirror location for incoming
     dak manage-build-queues -a
     dak generate-packages-sources2 -a build-queues
     dak generate-releases -a build-queues >/dev/null
-    ${scriptsdir}/update-buildd-archive ${base}/build-queues ${incoming}/debian-buildd
 
+    # And set up all of the top level symlinks people seem to like
+    find ${incoming}/web -depth 0 -type l -delete
+    dak export-suite -r -s "accepted" -d "$incoming/web"
+
+    # For now, we still create the local incoming.d.o setup
+    ${scriptsdir}/update-buildd-archive ${incoming}/web/debian-buildd ${incoming}/debian-buildd
     rm -f ${incoming}/public/*
     dak export-suite -s "accepted" -d "$incoming/public"
+
+    # Tell the mirrors that we've updated
+    /usr/local/bin/static-update-component incoming.debian.org
 }
 
 # Process (oldstable)-proposed-updates "NEW" queue
diff --git a/config/debian/vars b/config/debian/vars
index 03a86a7..e14e515 100644
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -23,7 +23,7 @@ queuedir=$base/queue/
 unchecked=$queuedir/unchecked/
 accepted=$queuedir/accepted/
 mirrordir=$base/mirror/
-incoming=$base/incoming
+incoming=$base/public/incoming.debian.org/
 newstage=$queuedir/newstage/
 exportdir=$base/export/
 exportpublic=$public/rsync/export/
-- 
1.7.10.4