X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=761c7249e745f565bab0180351dd8f5e7b75d2dd;hb=e31570b80732a4fb1d1ea8ed3e18d2ba7330b40c;hp=88ba3688d528e461fa8b0dc92093018303a82b9e;hpb=c6c8341a1a5643dc43c1785936068b6432aaaf12;p=dak.git

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
old mode 100644
new mode 100755
index 88ba3688..761c7249
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -105,7 +105,7 @@ function i18n1() {
 
     # Now check if we still know about the packages for which they created the files
     # is the timestamp signed by us?
-    if $(gpgv --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg timestamp.gpg timestamp); then
+    if gpgv --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg timestamp.gpg timestamp; then
         # now read it. As its signed by us we are sure the content is what we expect, no need
         # to do more here. And we only test -d a directory on it anyway.
         TSTAMP=$(cat timestamp)
@@ -152,7 +152,7 @@ function dep11() {
                 for comp in main contrib non-free; do
                     mkdir -p ${ftpdir}/dists/${dir}/${comp}/dep11
                     cd ${dir}/${comp}
-                    rsync -aq --delete --delete-after --exclude *.tmp . ${ftpdir}/dists/${dir}/${comp}/dep11/.
+                    rsync -aq --delete --delete-after --exclude ./*.tmp . ${ftpdir}/dists/${dir}/${comp}/dep11/.
                     cd ${dep11dir}
                 done
             fi
@@ -477,10 +477,17 @@ function mirror() {
         else
             SERIAL="${FILESOAPLUS1}"
         fi
+        RFC822DATE=$(LC_ALL=POSIX LANG=POSIX date -u -R)
         date -u > ${TRACEFILE}
-        echo "Using dak v1" >> ${TRACEFILE}
-        echo "Running on host: $(hostname -f)" >> ${TRACEFILE}
-        echo "Archive serial: ${SERIAL}" >> ${TRACEFILE}
+        {
+            echo "Using dak v1"
+            echo "Running on host: $(hostname -f)"
+            echo "Archive serial: ${SERIAL}"
+            echo "Date: ${RFC822DATE}"
+        } >> ${TRACEFILE}
+        # Now make it accessible via one name, no matter on which host we run
+        cd ${archiveroot}/project/trace/
+        ln -sf ftp-master.debian.org master
 
         mkdir -p ${targetpath}
         cd ${targetpath}
@@ -528,7 +535,7 @@ function mirrorpush() {
             while read SHASUM SIZE NAME; do
                 if ! [[ -f ${subdir}/${NAME} ]]; then
                     bname=$(basename ${NAME})
-                    if [[ "${bname}" =~ ^(Packages|Sources|Contents-[a-zA-Z0-9-]+|Translation-[a-zA-Z_]+|Components-(amd64|i386)\.yml|icons-(128x128|64x64)\.tar)$ ]]; then
+                    if [[ "${bname}" =~ ^(Packages|Sources|Contents-[a-zA-Z0-9-]+|Translation-[a-zA-Z_]+|Components-[a-zA-Z0-9-]\.yml|icons-(128x128|64x64)\.tar)$ ]]; then
 
                         # We don't keep unpacked files, don't check for their existance.
                         # We might want to go and check their unpacked shasum, but right now
@@ -570,6 +577,7 @@ function mirrorpush() {
                 ftp-master)
                     fname="mirrorstart"
                     pusharg=""
+                    pname="debian"
                     ;;
                 debian-debug)
                     pusharg="-a debug"
@@ -579,11 +587,15 @@ function mirrorpush() {
                     ;;&
                 *)
                     fname="mirrorstart.${archive}"
+                    pname=${archive}
                     ;;
             esac
-            date -u > /srv/ftp.debian.org/web/${fname}
-            echo "Using dak v1" >> /srv/ftp.debian.org/web/${fname}
-            echo "Running on host $(hostname -f)" >> /srv/ftp.debian.org/web/${fname}
+            mkdir -p ${webdir}/${pname}/project/trace/
+            ln -sf ${mirrordir}/${archive}/project/trace/master ${webdir}/${pname}/project/trace/master
+
+            date -u > ${webdir}/${fname}
+            echo "Using dak v1" >> ${webdir}/${fname}
+            echo "Running on host $(hostname -f)" >> ${webdir}/${fname}
             sudo -H -u archvsync /home/archvsync/runmirrors ${pusharg} > ~dak/runmirrors-${archive}.log 2>&1 &
         fi
     done
@@ -641,7 +653,7 @@ function savetimestamp() {
 }
 
 function maillogfile() {
-    cat "$LOGFILE" | mail -a "X-Debian: DAK" -s "Log for dinstall run of ${NOW}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" cron@ftp-master.debian.org
+    mail -a "X-Debian: DAK" -s "Log for dinstall run of ${NOW}" -a "From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>" cron@ftp-master.debian.org < "${LOGFILE}"
 }
 
 function testingsourcelist() {