X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=4836f53816d10f9049f07e8b47691e9d27a57c2f;hb=d31ae14a9de247d47d9ff7b3f36705a58a065916;hp=d6870a7c4ef78b2a6459e3269c544b2c2b26feb0;hpb=4880c97ecd3ad289f1511094f675e93147032caa;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index d6870a7c..4836f538 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -147,7 +147,7 @@ function overrides() {
 
 function mpfm() {
     log "Generating package / file mapping"
-    dak make-pkg-file-mapping | bzip2 -9 > $base/ftp/indices/package-file.map.bz2
+    dak make-pkg-file-mapping ftp-master | bzip2 -9 > $base/ftp/indices/package-file.map.bz2
 }
 
 function packages() {
@@ -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() {
@@ -194,38 +193,21 @@ function mklslar() {
     FILENAME=ls-lR
 
     log "Removing any core files ..."
-    find -type f -name core -print0 | xargs -0r rm -v
-
-    log "Checking permissions on files in the FTP tree ..."
-    find -type f \( \! -perm -444 -o -perm +002 \) -ls
-    find -type d \( \! -perm -555 -o -perm +002 \) -ls
+    find -type f -name core -print -delete
 
     log "Checking symlinks ..."
     symlinks -rd .
 
     log "Creating recursive directory listing ... "
-    rm -f .${FILENAME}.new
-    TZ=UTC ls -lR > .${FILENAME}.new
-
-    if [ -r ${FILENAME}.gz ] ; then
-        mv -f ${FILENAME}.gz ${FILENAME}.old.gz
-        mv -f .${FILENAME}.new ${FILENAME}
-        rm -f ${FILENAME}.patch.gz
-        zcat ${FILENAME}.old.gz | diff -u - ${FILENAME} | gzip -9cfn - >${FILENAME}.patch.gz
-        rm -f ${FILENAME}.old.gz
-    else
-        mv -f .${FILENAME}.new ${FILENAME}
-    fi
-
-    gzip -9cfN ${FILENAME} >${FILENAME}.gz
-    rm -f ${FILENAME}
+    rm -f ${FILENAME}.gz
+    TZ=UTC ls -lR | gzip -9c --rsyncable > ${FILENAME}.gz
 }
 
 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
 }
@@ -241,6 +223,7 @@ function copyoverrides() {
 }
 
 function mkfilesindices() {
+    set +o pipefail
     umask 002
     cd $base/ftp/indices/files/components
 
@@ -248,7 +231,7 @@ function mkfilesindices() {
 
     log "Querying postgres"
     local query="
-      SELECT CONCAT('./pool/', c.name, '/', f.filename) AS path, a.arch_string AS arch_string
+      SELECT './pool/' || c.name || '/' || f.filename AS path, a.arch_string AS arch_string
       FROM files f
       JOIN files_archive_map af ON f.id = af.file_id
       JOIN component c ON af.component_id = c.id
@@ -296,7 +279,7 @@ function mkfilesindices() {
 	local suite_id="$(printf %d $1)"
 	local query
 	query="
-          SELECT DISTINCT CONCAT('./pool/', c.name, '/', f.filename)
+          SELECT DISTINCT './pool/' || c.name || '/' || f.filename
           FROM
             (SELECT sa.source AS source
                FROM src_associations sa
@@ -320,7 +303,7 @@ function mkfilesindices() {
 	psql -F' ' -A -t -c "$query"
 
 	query="
-          SELECT CONCAT('./pool/', c.name, '/', f.filename)
+          SELECT './pool/' || c.name || '/' || f.filename
           FROM bin_associations ba
           JOIN binaries b ON ba.bin = b.id
           JOIN files f ON b.file = f.id
@@ -373,6 +356,7 @@ function mkfilesindices() {
 
     rm -f $ARCHLIST
     log "Done!"
+    set -o pipefail
 }
 
 function mkchecksums() {
@@ -417,8 +401,8 @@ function transitionsclean() {
 }
 
 function dm() {
-    log "Updating DM html page"
-    $scriptsdir/dm-monitor >$webdir/dm-uploaders.html
+    log "Updating DM permissions page"
+    dak acl export-per-source dm >$exportdir/dm.txt
 }
 
 function bts() {
@@ -429,7 +413,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() {
@@ -499,7 +483,7 @@ function i18n2() {
         dak control-suite -l ${suite} >${codename}
     done
     echo "${STAMP}" > timestamp
-    gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o timestamp.gpg timestamp
+    gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o timestamp.gpg timestamp
     rm -f md5sum
     md5sum * > md5sum
     cd ${webdir}/
@@ -572,13 +556,6 @@ function process_unchecked() {
     sync_debbugs
 }
 
-# do a run of newstage only before dinstall is on.
-function newstage() {
-    log "Processing the newstage queue"
-    UNCHECKED_WITHOUT_LOCK="-p"
-    do_newstage
-}
-
 # Function to update a "statefile" telling people what we are doing
 # (more or less).
 #
@@ -597,7 +574,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/. .