symlinks

no longer call symlinks in every dinstall run. instead call it once per
week.
Also call it in di-byhand, just to ensure there isnt any symlink going wrong
there.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 96001838e3f1c2a5c8e874622c8d4e52170652b2..f7c128f59b562e5de8f590d7f1d1290d79b99d24 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -197,9 +197,6 @@ function accepted() {
 function cruft() {
     log "Checking for cruft in overrides"
     dak check-overrides
-
-    log "Fixing symlinks in $ftpdir"
-    symlinks -d -r $ftpdir
 }
 
 function msfl() {

diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 5ab9d8b88a7efcb64f5db92f74ad72c33b3a3ff4..34f0c64a4a535aa04da929ef51c4f408ddd0e371 100755 (executable)
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -57,6 +57,9 @@ apt-ftparchive -q clean apt.conf.buildd
 echo "Update wanna-build database dump"
 /org/ftp.debian.org/scripts/nfu/get-w-b-db
 
+echo "Fixing symlinks in $ftpdir"
+symlinks -d -r $ftpdir
+
 echo "Finally, all is done, compressing logfile"
 exec > /dev/null 2>&1
 

diff --git a/scripts/debian/byhand-di b/scripts/debian/byhand-di
index 0a004f3899956e22e4f0580dc2f56c126b945879..67db55168ae5f16852447413a94ac418314aad2d 100755 (executable)
--- a/scripts/debian/byhand-di
+++ b/scripts/debian/byhand-di
@@ -95,6 +95,10 @@ mv "$TMPDIR/installer-$ARCH/current"  "$TARGET"
 find "$TARGET/$VERSION" -type d -exec chmod 755 {} +
 find "$TARGET/$VERSION" -type f -exec chmod 644 {} +
 
+# Make sure nothing symlinks outside of the ftpdir
+# Shouldnt happen, but better be sure.
+symlinks -d -r /srv/ftp.debian.org/ftp
+
 trap - EXIT
 cleanup