More changes for franck

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

diff --git a/config/debian/cron.reboot b/config/debian/cron.reboot
index 241dd84670be4b9d155bf64d172887fc989ed423..b0129733422ee1ff4e8e4ec40e13f356a4cd1654 100755 (executable)
--- a/config/debian/cron.reboot
+++ b/config/debian/cron.reboot
@@ -39,7 +39,7 @@ DEBUG=0
 PROGRAM="dinstall_reboot"
 
 # where do we want mails to go? For example log entries made with error()
-if [ "x$(hostname -s)x" != "xriesx" ]; then
+if [ "x$(hostname -s)x" != "xfranckx" ]; then
     # Not our ftpmaster host
     MAILTO=${MAILTO:-"root"}
 else

diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 8f1042dacf581376723d2295820cb378e1ca1276..6894e0b19d7aafdc89bf6b3c23160682255d40fb 100755 (executable)
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -40,7 +40,7 @@ echo "VACUUM; VACUUM ANALYZE;" | psql --no-psqlrc projectb 2>&1
 
 # Do git cleanup stuff
 echo "Doing git stuff"
-cd /org/ftp.debian.org/git/dak.git
+cd /srv/ftp-master.debian.org/git/dak.git
 git gc --prune
 git update-server-info
 # now workaround a git bug not honoring the setup in logs/*
@@ -55,7 +55,7 @@ apt-ftparchive -q clean apt.conf.buildd
 
 # Update wanna-build dump
 echo "Update wanna-build database dump"
-/org/ftp.debian.org/scripts/nfu/get-w-b-db
+/srv/ftp-master.debian.org/scripts/nfu/get-w-b-db
 
 echo "Fixing symlinks in $ftpdir"
 symlinks -d -r $ftpdir

diff --git a/scripts/debian/byhand-di b/scripts/debian/byhand-di
index 67db55168ae5f16852447413a94ac418314aad2d..70faceb63cfec40a53a0089508729d258cc1be4a 100755 (executable)
--- a/scripts/debian/byhand-di
+++ b/scripts/debian/byhand-di
@@ -37,7 +37,7 @@ case $SUITE in
 esac
 
 # This must end with /
-TARGET="/srv/ftp.debian.org/ftp/dists/$SUITE/main/installer-$ARCH/"
+TARGET="/srv/ftp-master.debian.org/ftp/dists/$SUITE/main/installer-$ARCH/"
 
 # Check validity of the target directory
 # This could fail, for example for new architectures; doing
@@ -97,7 +97,7 @@ 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
+symlinks -d -r /srv/ftp-master.debian.org/ftp
 
 trap - EXIT
 cleanup

diff --git a/scripts/debian/byhand-tag b/scripts/debian/byhand-tag
index c0ddf5a30061678a39846a23c3b7f03f8d2b4522..81a8946676a8a3af626813d7e4ac4c8798b98c90 100755 (executable)
--- a/scripts/debian/byhand-tag
+++ b/scripts/debian/byhand-tag
@@ -1,6 +1,6 @@
 #!/bin/sh -ue
 
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 # Tarball to read, compressed with gzip
@@ -10,7 +10,7 @@ INPUT="${1:?"Usage: $0 filename"}"
 CHECKRE='^[a-z0-9A-Z.+-]+[[:space:]]+Tag[[:space:]]+[a-z0-9:. ,{}+-]+$'
 
 # This must end with /
-TARGET=/srv/ftp.debian.org/scripts/external-overrides/
+TARGET=/srv/ftp-master.debian.org/scripts/external-overrides/
 
 # Read the main directory from the tarball
 DIR="`tar ztf \"$INPUT\" | tac | tail -n 1`"

diff --git a/scripts/debian/byhand-task b/scripts/debian/byhand-task
index 9fca5f952c21d784611cd3a2edf2375336af72e6..82f0964482889732c6f506cfff5a0bd3841d259d 100755 (executable)
--- a/scripts/debian/byhand-task
+++ b/scripts/debian/byhand-task
@@ -5,7 +5,7 @@ if [ $# -lt 4 ]; then
         exit 1
 fi
 
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 INPUT="$1"      # Tarball to read, compressed with gzip
@@ -38,7 +38,7 @@ esac
 CHECKRE='^[a-z0-9A-Z.+-]+[[:space:]]+Task[[:space:]]+[a-z0-9:. ,{}+-]+$'
 
 # This must end with /
-TARGET=/srv/ftp.debian.org/scripts/external-overrides/
+TARGET=/srv/ftp-master.debian.org/scripts/external-overrides/
 
 # Read the main directory from the tarball
 DIR="`tar ztf \"$INPUT\" | tac | tail -n 1`"

diff --git a/scripts/debian/ftpstats.R b/scripts/debian/ftpstats.R
index 2626f238290285c7a5062d207965c1d8cd47da84..2fa6569bee1ef849added5b53f80523323867262 100644 (file)
--- a/scripts/debian/ftpstats.R
+++ b/scripts/debian/ftpstats.R
@@ -11,9 +11,9 @@ plotsize <- function(file,title,p,height=11.8,width=16.9) {
        legend(par("usr")[1]+xinch(5),par("usr")[4]-yinch(0.1),legend=colnames(t),
                ncol=3,fill=1:15,xjust=1,yjust=1)
 }
-t <- (read.table("/org/ftp.debian.org/misc/ftpstats.data",sep=",",header=0,row.names=1,col.names=cname))/1024/1024
+t <- (read.table("/srv/ftp-master.debian.org/misc/ftpstats.data",sep=",",header=0,row.names=1,col.names=cname))/1024/1024
 v <- t[(length(t$all)-90):(length(t$all)),1:15]
 
 #plotsize("/org/ftp.debian.org/web/size.png","Daily dinstall run size by arch",t)
-plotsize("/org/ftp.debian.org/web/size-quarter.png","Daily dinstall run size by arch (past quarter)",v)
+plotsize("/srv/ftp-master.debian.org/web/size-quarter.png","Daily dinstall run size by arch (past quarter)",v)
 

diff --git a/scripts/debian/generate-d-i b/scripts/debian/generate-d-i
index fee0ba5bbe6c21097a8e243ff293fa3d97b1dbb3..db3808392c3acdda31a94c1741d6199e5fcf3df0 100755 (executable)
--- a/scripts/debian/generate-d-i
+++ b/scripts/debian/generate-d-i
@@ -3,7 +3,7 @@
 # Original written from Jeroen van Wolffelaar <jeroen@debian.org>
 
 set -e
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 export PAGER=cat

diff --git a/scripts/debian/import_testing.sh b/scripts/debian/import_testing.sh
index 6b5fa6c00a837867ec4011f445ccd88a62f50c44..8eeff8445c9202397eddac34b4b40b06f5d64c5a 100755 (executable)
--- a/scripts/debian/import_testing.sh
+++ b/scripts/debian/import_testing.sh
@@ -25,7 +25,7 @@
 set -e
 
 # Load up some standard variables
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 # What file we look at.

diff --git a/scripts/debian/mk-extra-overrides.sh b/scripts/debian/mk-extra-overrides.sh
index 4b9cff6a9f99094ae0a66bdffe630e9f7226f3cf..e331e88eb9535b5cd1a50e01fda9fb83f5335915 100755 (executable)
--- a/scripts/debian/mk-extra-overrides.sh
+++ b/scripts/debian/mk-extra-overrides.sh
@@ -4,8 +4,8 @@
 #  grep -Ev '^[a-z0-9A-Z.+-]+\   Task    [a-z0-9:. ,+-]+$' task*
 
 x="build-essential tag task"
-opath="/org/ftp.debian.org/scripts/override"
-apath="/org/ftp.debian.org/ftp/dists"
+opath="/srv/ftp-master.debian.org/scripts/override"
+apath="/srv/ftp-master.debian.org/ftp/dists"
 
 if [ ! -d "$apath" ]; then
   echo "$0: invalid path to archive" >&2

diff --git a/scripts/nfu/get-w-b-db b/scripts/nfu/get-w-b-db
index 84c15e26d286f9b9bfc84491eaf62780bf7d7378..d525fd23335fe33834c64bdac89dd55daa42e96e 100755 (executable)
--- a/scripts/nfu/get-w-b-db
+++ b/scripts/nfu/get-w-b-db
@@ -9,7 +9,7 @@ set -e
 # the WB_DB_DIR enviroment variable
 if [ -z "$WB_DB_DIR" ]
 then
-       WB_DB_DIR=/srv/ftp.debian.org/scripts/nfu
+       WB_DB_DIR=/srv/ftp-master.debian.org/scripts/nfu
 fi
 
 cd $WB_DB_DIR || { echo "Failed to cd to $WB_DB_DIR" ; exit 1 ;}

diff --git a/tools/removals.pl b/tools/removals.pl
index 839fc618c9e060f7fe929825589c1b3a55950af7..d4855ff693d5a9bb91f52a879fa6f7e21d86bf82 100755 (executable)
--- a/tools/removals.pl
+++ b/tools/removals.pl
@@ -26,7 +26,7 @@ use XML::RSS;
 use POSIX qw(strftime);
 use CGI qw/:standard/;
 
-open REMOVALS, "</srv/ftp.debian.org/web/removals.txt";
+open REMOVALS, "</srv/ftp-master.debian.org/web/removals.txt";
 
 my @removals;