X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian-security%2Fcron.daily;h=025f6fcaab038a3503bd978b822c86e149d75ebe;hb=e531ecdc04d1c9204ab001a3dac9eda2b6405338;hp=4e02e57ee903d472454b8e18276b3c0d4d6a7173;hpb=16f731a893f0ba036a995c25b8b5f3490394070e;p=dak.git

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 4e02e57e..025f6fca 100755
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -3,14 +3,14 @@
 # Executed daily via cron, out of dak's crontab.
 
 set -e
-export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
+export SCRIPTVARS=/org/security-master.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 
 ################################################################################
 
 # Fix overrides
 
-rsync --delete -r --include=override\* --exclude=\* --password-file /srv/non-us.debian.org/s3kr1t/rsync-password -ql security-master@ftp-master::indices/ $overridedir
+rsync --delete -r --include=override\* --exclude=\* --password-file /srv/security-master.debian.org/s3kr1t/rsync-password -ql security-master@ftp-master::indices/ $overridedir
 
 cd $overridedir
 for file in override*.gz; do
@@ -20,9 +20,9 @@ find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm
 
 for suite in $suites; do
     case $suite in
-		oldstable) override_suite=sarge;;
-		stable) override_suite=etch;;
-		testing) override_suite=lenny;;
+		oldstable) override_suite=etch;;
+		stable) override_suite=lenny;;
+		testing) override_suite=squeeze;;
 		*) echo "Unknown suite type ($suite)"; exit 1;;
     esac
     for component in $components; do
@@ -44,7 +44,7 @@ for suite in $suites; do
 done
 
 # Generate .all3 overides for the buildd support
-for dist in etch lenny; do
+for dist in etch lenny squeeze; do
     rm -f override.$dist.all3
     components="main contrib non-free";
     if [ -f override.$dist.main.debian-installer.gz ]; then
@@ -60,11 +60,6 @@ done
 
 ################################################################################
 
-# Freshen Packages-Arch-Specific
-wget -qN http://buildd.debian.org/quinn-diff/Packages-arch-specific -O $base/buildd/Packages-arch-specific
-
-################################################################################
-
 cd $masterdir
 dak clean-queues
 dak clean-suites
@@ -73,7 +68,7 @@ apt-ftparchive -q clean apt.conf.buildd
 
 symlinks -d -r $ftpdir
 
-pg_dump obscurity > /org/security.debian.org/dak-backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
+pg_dump obscurity > /org/security-master.debian.org/dak-backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 
 # Vacuum the database
 set +e