X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=064ba81b393987b42ec4923a35624475b590e9dd;hb=80a6a79b8b82ec9bda2fa68f69ce611048a4d110;hp=4dae0320663065ddb45f733645baaf98cfa49616;hpb=05c1887d078b9c6802046d8274aa21b9d8b70fa0;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 4dae0320..064ba81b 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -177,8 +177,7 @@ function release() {
 function dakcleanup() {
     log "Cleanup old packages/files"
     dak clean-suites -m 10000
-    # XXX: reactivate once clean-queues is fixed
-    #dak clean-queues
+    dak clean-queues -i "$unchecked"
 }
 
 function buildd_dir() {
@@ -208,7 +207,7 @@ function mkmaintainers() {
     log 'Creating Maintainers index ... '
 
     cd $indices
-    dak make-maintainers ${scriptdir}/masterfiles/pseudo-packages.maintainers
+    dak make-maintainers -a ftp-master ${scriptdir}/masterfiles/pseudo-packages.maintainers
     gzip -9v --rsyncable <Maintainers >Maintainers.gz
     gzip -9v --rsyncable <Uploaders >Uploaders.gz
 }
@@ -404,6 +403,7 @@ function transitionsclean() {
 function dm() {
     log "Updating DM html page"
     $scriptsdir/dm-monitor >$webdir/dm-uploaders.html
+    dak acl export-per-source dm >$exportdir/dm.txt
 }
 
 function bts() {
@@ -414,7 +414,7 @@ function bts() {
 function ddaccess() {
     # Tell our dd accessible mirror to sync itself up. Including ftp dir.
     log "Trigger dd accessible parts sync including ftp dir"
-    ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30 -2 -i ${base}/s3kr1t/pushddmirror dak@ries.debian.org pool
+    ${scriptsdir}/sync-dd ries-sync ries-sync1 ries-sync2 pool
 }
 
 function mirrorpush() {
@@ -575,7 +575,7 @@ EOF
 # extract changelogs and stuff
 function changelogs() {
     log "Extracting changelogs"
-    dak make-changelog -e
+    dak make-changelog -e -a ftp-master
     mkdir -p ${exportpublic}/changelogs
     cd ${exportpublic}/changelogs
     rsync -aHW --delete --delete-after --ignore-errors ${exportdir}/changelogs/. .