From: Mark Hymers <mhy@debian.org>
Date: Sat, 18 Sep 2010 11:04:05 +0000 (+0000)
Subject: Merge commit 'ftpmaster/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=95109ebb89d25a20ccb89fd10a857585fb23f8a6;hp=d0940f70aea01a1a7ab1715757f8aae535ec0dde;p=dak.git

Merge commit 'ftpmaster/master'
---

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 8a2b23a9..eaa89c27 100644
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -437,3 +437,8 @@ Import-LDAP-Fingerprints
   };
   KeyServer "wwwkeys.eu.pgp.net";
 };
+
+Changelogs
+{
+  Export "/srv/backports-master.debian.org/export/changelogs";
+}
diff --git a/config/backports/dinstall.functions b/config/backports/dinstall.functions
index 0ae81724..2757a179 100644
--- a/config/backports/dinstall.functions
+++ b/config/backports/dinstall.functions
@@ -604,3 +604,12 @@ Current action: ${1}
 Action start: ${RIGHTNOW}
 EOF
 }
+
+# extract changelogs and stuff
+function changelogs() {
+    log "Extracting changelogs"
+    dak make-changelog -e
+    mkdir -p ${exportpublic}/changelogs
+    cd ${exportpublic}/changelogs
+    rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. .
+}
diff --git a/config/backports/vars b/config/backports/vars
index 7f051f82..25158581 100644
--- a/config/backports/vars
+++ b/config/backports/vars
@@ -1,10 +1,11 @@
 # locations used by many scripts
 
 base=/srv/backports-master.debian.org
+public=/srv/backports-web.debian.org
 bindir=$base/bin
 ftpdir=$base/ftp/
 indices=$ftpdir/indices
-webdir=/srv/backports-web.debian.org/underlay/
+webdir=$public/underlay/
 scriptdir=$base/scripts
 
 archs="alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 "
@@ -27,6 +28,8 @@ incoming=$base/incoming
 logdir=$base/log/cron/
 mirrordir=$base/mirror/
 newstage=$queuedir/newstage/
+exportdir=$base/export/
+exportpublic=$public/export/
 
 
 ftpgroup=debadmin
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 0841f838..a9e9bd18 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -388,6 +388,14 @@ rm -f "${LOCK_DAILY}"
 ts "locked part finished"
 state "postlock"
 
+GO=(
+    FUNC="changelogs"
+    TIME="changelogs"
+    ARGS=""
+    ERR="false"
+)
+stage $GO &
+
 GO=(
     FUNC="pgdump_post"
     TIME="pg_dump2"
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 1b508d25..c5aeed13 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -604,3 +604,12 @@ Current action: ${1}
 Action start: ${RIGHTNOW}
 EOF
 }
+
+# extract changelogs and stuff
+function changelogs() {
+    log "Extracting changelogs"
+    dak make-changelog -e
+    mkdir -p ${exportpublic}/changelogs
+    cd ${exportpublic}/changelogs
+    rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. .
+}
diff --git a/config/debian/vars b/config/debian/vars
index 2a3200cf..0d5eb529 100644
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -25,6 +25,8 @@ accepted=$queuedir/accepted/
 mirrordir=$base/mirror/
 incoming=$base/incoming
 newstage=$queuedir/newstage/
+exportdir=$base/export/
+exportpublic=$public/rsync/export/
 
 ftpgroup=debadmin