path changes

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

diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index 257470ec9f0edcd60b59e7a1142987892bd33cfd..73b511ee548cde05f4500da3627173aa5bc6ad75 100644 (file)
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -1,8 +1,8 @@
 Dir 
 {
-   ArchiveDir "/srv/ftp.debian.org/ftp/";
-   OverrideDir "/srv/ftp.debian.org/scripts/override/";
-   CacheDir "/srv/ftp.debian.org/database/";
+   ArchiveDir "/srv/ftp-master.debian.org/ftp/";
+   OverrideDir "/srv/ftp-master.debian.org/scripts/override/";
+   CacheDir "/srv/ftp-master.debian.org/database/";
 };
 
 Default
@@ -17,13 +17,13 @@ Default
 
 TreeDefault
 {
-   Contents::Header "/srv/ftp.debian.org/dak/config/debian/Contents.top";
+   Contents::Header "/srv/ftp-master.debian.org/dak/config/debian/Contents.top";
 };
 
 //tree "dists/oldstable-proposed-updates"
 //{
-//   FileList "/srv/ftp.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_binary-$(ARCH).list";
-//   SourceFileList "/srv/ftp.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_source.list";
+//   FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_binary-$(ARCH).list";
+//   SourceFileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_source.list";
 //   Sections "main contrib non-free";
 //   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
 //   BinOverride "override.etch.$(SECTION)";
@@ -34,8 +34,8 @@ TreeDefault
 
 tree "dists/proposed-updates"
 {
-   FileList "/srv/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_source.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
    BinOverride "override.lenny.$(SECTION)";
@@ -47,8 +47,8 @@ tree "dists/proposed-updates"
 tree "dists/testing"
 {
    FakeDI "dists/unstable";
-   FileList "/srv/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp.debian.org/database/dists/testing_$(SECTION)_source.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
    BinOverride "override.squeeze.$(SECTION)";
@@ -58,8 +58,8 @@ tree "dists/testing"
 
 tree "dists/testing-proposed-updates"
 {
-   FileList "/srv/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
    BinOverride "override.squeeze.$(SECTION)";
@@ -70,8 +70,8 @@ tree "dists/testing-proposed-updates"
 
 tree "dists/unstable"
 {
-   FileList "/srv/ftp.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp.debian.org/database/dists/unstable_$(SECTION)_source.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/unstable_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
    BinOverride "override.sid.$(SECTION)";
@@ -83,7 +83,7 @@ tree "dists/unstable"
 
 //tree "dists/oldstable-proposed-updates/main"
 //{
-//   FileList "/srv/ftp.debian.org/database/dists/oldstable-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
+//   FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
 //   Sections "debian-installer";
 //   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
 //   BinOverride "override.etch.main.$(SECTION)";
@@ -95,7 +95,7 @@ tree "dists/unstable"
 
 tree "dists/proposed-updates/main"
 {
-   FileList "/srv/ftp.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
    BinOverride "override.lenny.main.$(SECTION)";
@@ -107,7 +107,7 @@ tree "dists/proposed-updates/main"
 
 tree "dists/testing/main"
 {
-   FileList "/srv/ftp.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp-master.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
    BinOverride "override.squeeze.main.$(SECTION)";
@@ -119,7 +119,7 @@ tree "dists/testing/main"
 
 tree "dists/testing/non-free"
 {
-   FileList "/srv/ftp.debian.org/database/dists/testing_non-free_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp-master.debian.org/database/dists/testing_non-free_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
    BinOverride "override.squeeze.main.$(SECTION)";
@@ -131,7 +131,7 @@ tree "dists/testing/non-free"
 
 tree "dists/testing-proposed-updates/main"
 {
-   FileList "/srv/ftp.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
    BinOverride "override.squeeze.main.$(SECTION)";
@@ -143,7 +143,7 @@ tree "dists/testing-proposed-updates/main"
 
 tree "dists/unstable/main"
 {
-   FileList "/srv/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp-master.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
    BinOverride "override.sid.main.$(SECTION)";
@@ -155,7 +155,7 @@ tree "dists/unstable/main"
 
 tree "dists/unstable/non-free"
 {
-   FileList "/srv/ftp.debian.org/database/dists/unstable_non-free_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp-master.debian.org/database/dists/unstable_non-free_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
    BinOverride "override.sid.main.$(SECTION)";
@@ -167,7 +167,7 @@ tree "dists/unstable/non-free"
 
 tree "dists/experimental/main"
 {
-   FileList "/srv/ftp.debian.org/database/dists/experimental_main_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp-master.debian.org/database/dists/experimental_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
    BinOverride "override.sid.main.$(SECTION)";
@@ -179,7 +179,7 @@ tree "dists/experimental/main"
 
 tree "dists/experimental/non-free"
 {
-   FileList "/srv/ftp.debian.org/database/dists/experimental_non-free_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp-master.debian.org/database/dists/experimental_non-free_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
    BinOverride "override.sid.main.$(SECTION)";
@@ -193,8 +193,8 @@ tree "dists/experimental/non-free"
 
 tree "dists/experimental"
 {
-   FileList "/srv/ftp.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp.debian.org/database/dists/experimental_$(SECTION)_source.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/experimental_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
    BinOverride "override.sid.$(SECTION)";

diff --git a/config/debian/apt.conf.buildd b/config/debian/apt.conf.buildd
index 65a8363e74ec7f4046d57a1c89edfff3c9a36617..88ebf4ae10b38be8f918db12a16648dce9064340 100644 (file)
--- a/config/debian/apt.conf.buildd
+++ b/config/debian/apt.conf.buildd
@@ -1,8 +1,8 @@
 Dir 
 {
    ArchiveDir "/srv/incoming.debian.org/buildd/";
-   OverrideDir "/srv/ftp.debian.org/scripts/override/";
-   CacheDir "/srv/ftp.debian.org/database/";
+   OverrideDir "/srv/ftp-master.debian.org/scripts/override/";
+   CacheDir "/srv/ftp-master.debian.org/database/";
 };
 
 Default
@@ -21,7 +21,7 @@ bindirectory "incoming"
    BinOverride "override.sid.all3";
    BinCacheDB "packages-accepted.db";
    
-   FileList "/srv/ftp.debian.org/database/dists/unstable_accepted.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/unstable_accepted.list";
 
    PathPrefix "";
    Packages::Extensions ".deb .udeb";
@@ -32,6 +32,6 @@ bindirectory "incoming/"
    Sources "Sources";
    BinOverride "override.sid.all3";
    SrcOverride "override.sid.all3.src";
-   FileList "/srv/ftp.debian.org/database/dists/unstable_accepted.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/unstable_accepted.list";
 };
 

diff --git a/config/debian/apt.conf.oldstable b/config/debian/apt.conf.oldstable
index 5f96e405df088de723ea442b507c6d8002c626c8..1cfe2357101819d54b9d35e3b957f27d3a33bc6f 100644 (file)
--- a/config/debian/apt.conf.oldstable
+++ b/config/debian/apt.conf.oldstable
@@ -1,8 +1,8 @@
 Dir
 {
-   ArchiveDir "/srv/ftp.debian.org/ftp/";
-   OverrideDir "/srv/ftp.debian.org/scripts/override/";
-   CacheDir "/srv/ftp.debian.org/database/";
+   ArchiveDir "/srv/ftp-master.debian.org/ftp/";
+   OverrideDir "/srv/ftp-master.debian.org/scripts/override/";
+   CacheDir "/srv/ftp-master.debian.org/database/";
 };
 
 Default
@@ -16,13 +16,13 @@ Default
 
 TreeDefault
 {
-   Contents::Header "/srv/ftp.debian.org/dak/config/debian/Contents.top";
+   Contents::Header "/srv/ftp-master.debian.org/dak/config/debian/Contents.top";
 };
 
 tree "dists/oldstable"
 {
-   FileList "/srv/ftp.debian.org/database/dists/oldstable_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp.debian.org/database/dists/oldstable_$(SECTION)_source.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/oldstable_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/oldstable_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
    BinOverride "override.etch.$(SECTION)";
@@ -34,7 +34,7 @@ tree "dists/oldstable"
 
 tree "dists/oldstable/main"
 {
-   FileList "/srv/ftp.debian.org/database/dists/oldstable_main_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp-master.debian.org/database/dists/oldstable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
    BinOverride "override.etch.main.$(SECTION)";
@@ -46,7 +46,7 @@ tree "dists/oldstable/main"
 
 tree "dists/oldstable/non-free"
 {
-   FileList "/srv/ftp.debian.org/database/dists/oldstable_non-free_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp-master.debian.org/database/dists/oldstable_non-free_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
    BinOverride "override.etch.main.$(SECTION)";

diff --git a/config/debian/apt.conf.stable b/config/debian/apt.conf.stable
index 7a16f0663d872e768ec1a61a4342b65b51761585..0e854c120bc40afbdf627be9fbbc1533ac16a642 100644 (file)
--- a/config/debian/apt.conf.stable
+++ b/config/debian/apt.conf.stable
@@ -1,8 +1,8 @@
 Dir
 {
-   ArchiveDir "/srv/ftp.debian.org/ftp/";
-   OverrideDir "/srv/ftp.debian.org/scripts/override/";
-   CacheDir "/srv/ftp.debian.org/database/";
+   ArchiveDir "/srv/ftp-master.debian.org/ftp/";
+   OverrideDir "/srv/ftp-master.debian.org/scripts/override/";
+   CacheDir "/srv/ftp-master.debian.org/database/";
 };
 
 Default
@@ -16,13 +16,13 @@ Default
 
 TreeDefault
 {
-   Contents::Header "/srv/ftp.debian.org/dak/config/debian/Contents.top";
+   Contents::Header "/srv/ftp-master.debian.org/dak/config/debian/Contents.top";
 };
 
 tree "dists/stable"
 {
-   FileList "/srv/ftp.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp.debian.org/database/dists/stable_$(SECTION)_source.list";
+   FileList "/srv/ftp-master.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/stable_$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
    BinOverride "override.lenny.$(SECTION)";
@@ -34,7 +34,7 @@ tree "dists/stable"
 
 tree "dists/stable/main"
 {
-   FileList "/srv/ftp.debian.org/database/dists/stable_main_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp-master.debian.org/database/dists/stable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
    BinOverride "override.lenny.main.$(SECTION)";
@@ -46,7 +46,7 @@ tree "dists/stable/main"
 
 tree "dists/stable/non-free"
 {
-   FileList "/srv/ftp.debian.org/database/dists/stable_non-free_$(SECTION)_binary-$(ARCH).list";
+   FileList "/srv/ftp-master.debian.org/database/dists/stable_non-free_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
    Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
    BinOverride "override.lenny.main.$(SECTION)";

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 856548e659756600b25db59403b3d13e0191e2c0..7b1a2f2a7a5aaa8f1bc16082989907bd410d5f47 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -35,7 +35,7 @@ set -u
 set -E
 
 # import the general variable set.
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 ########################################################################

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 334523748aad60bf849ecad139d9043eb36b72c8..1dcc2abb5bb1159e0ee5af633bac126a384fe6d3 100755 (executable)
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -5,7 +5,7 @@
 set -e
 set -u
 
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 dak import-users-from-passwd

diff --git a/config/debian/cron.monthly b/config/debian/cron.monthly
index 184280b8c702ea872bca518b55329738143d52c0..3d4c8c1164a944e93b306cb48078f36f13fcd28e 100755 (executable)
--- a/config/debian/cron.monthly
+++ b/config/debian/cron.monthly
@@ -4,14 +4,14 @@
 
 set -e
 set -u
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 ################################################################################
 
 DATE=`date -d yesterday +%y%m`
 
-cd /srv/ftp.debian.org/mail/archive
+cd /srv/ftp-master.debian.org/mail/archive
 for m in mail bxamail; do
     if [ -f $m ]; then
         mv $m ${m}-$DATE

diff --git a/config/debian/cron.reboot b/config/debian/cron.reboot
index 865efcbe382b259b1f2e338336d93987d5dfce43..241dd84670be4b9d155bf64d172887fc989ed423 100755 (executable)
--- a/config/debian/cron.reboot
+++ b/config/debian/cron.reboot
@@ -26,7 +26,7 @@ set -u
 set -E
 
 # import the general variable set.
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 # common functions are "outsourced"

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index fbc2a5efb3b3e7c906709ead0704e0680a3e1d19..c89c24c184aee357520d317f0609210452a08978 100755 (executable)
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -26,7 +26,7 @@ set -u
 set -E
 
 # import the general variable set.
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 LOCKDAILY=""

diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index efb264f70a64fd3c410b42b5c870d7940c33d902..8f1042dacf581376723d2295820cb378e1ca1276 100755 (executable)
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -8,7 +8,7 @@ set -u
 # substitutions and subshells and whatnot, but for us the functions is
 # the important part here)
 set -E
-export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 # Start logging

diff --git a/config/debian/crontab b/config/debian/crontab
index eb3f65da5cb225ba5cc4f4a9975dd1eeb47596a5..4c0b96932650cef52928825b1872233e2199fab3 100644 (file)
--- a/config/debian/crontab
+++ b/config/debian/crontab
@@ -1,14 +1,14 @@
 MAILTO=cron@ftp-master.debian.org
 PATH=/usr/local/bin:/usr/bin:/bin
 # m        h          dom mon dow command
-2,17,32,47 *          *   *   *   /srv/ftp.debian.org/dak/config/debian/cron.unchecked
-0          *          *   *   *   /srv/ftp.debian.org/dak/config/debian/cron.hourly
-52         1,7,13,19  *   *   *   /srv/ftp.debian.org/dak/config/debian/cron.dinstall
+2,17,32,47 *          *   *   *   /srv/ftp-master.debian.org/dak/config/debian/cron.unchecked
+0          *          *   *   *   /srv/ftp-master.debian.org/dak/config/debian/cron.hourly
+52         1,7,13,19  *   *   *   /srv/ftp-master.debian.org/dak/config/debian/cron.dinstall
 #### And an alternate line, for the times the release team wants it half an hour late.
-####22         2,8,14,20  *   *   *   /srv/ftp.debian.org/dak/config/debian/cron.dinstall
-0          12         *   *   0   /srv/ftp.debian.org/dak/config/debian/cron.weekly
-6          0          1   *   *   /srv/ftp.debian.org/dak/config/debian/cron.monthly
-@reboot                           /srv/ftp.debian.org/dak/config/debian/cron.reboot
+####22         2,8,14,20  *   *   *   /srv/ftp-master.debian.org/dak/config/debian/cron.dinstall
+0          12         *   *   0   /srv/ftp-master.debian.org/dak/config/debian/cron.weekly
+6          0          1   *   *   /srv/ftp-master.debian.org/dak/config/debian/cron.monthly
+@reboot                           /srv/ftp-master.debian.org/dak/config/debian/cron.reboot
 
 0          0          *   *   *   crontab -l > ~/crontab.out
 

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7c76d0ca60c2a07f12156a23790a678cfb0b7b9d..c0a902c400ba29b24d67e139b762390807471561 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -5,8 +5,8 @@ Dinstall
       "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
       "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
    };
-   SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
-   SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
+   SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
+   SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
    SigningKeyIds "55BE302B";
 //   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
    SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
@@ -17,7 +17,7 @@ Dinstall
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   LockFile "/srv/ftp.debian.org/lock/dinstall.lock";
+   LockFile "/srv/ftp-master.debian.org/lock/dinstall.lock";
    Bcc "archive@ftp-master.debian.org";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
@@ -26,7 +26,7 @@ Dinstall
    CloseBugs "true";
    OverrideDisparityCheck "true";
    DefaultSuite "unstable";
-   LintianTags "/srv/ftp.debian.org/dak/config/debian/lintian.tags";
+   LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags";
    QueueBuildSuites
    {
      unstable;
@@ -34,7 +34,7 @@ Dinstall
    Reject
    {
      NoSourceOnly "true";
-     ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
+     ReleaseTransitions "/srv/ftp-master.debian.org/web/transitions.yaml";
    };
    // if you setup an own dak repository and want to upload Debian packages you most possibly want
    // to set the following option to a real path/filename and then enter those mail addresses that
@@ -55,7 +55,7 @@ Generate-Index-Diffs
 {
    Options
    {
-     TempDir "/srv/ftp.debian.org/tiffani";
+     TempDir "/srv/ftp-master.debian.org/tiffani";
      MaxDiffs { Default 14; };
    };
 };
@@ -67,9 +67,9 @@ Override
 
 Mirror-Split
 {
-  FTPPath "/srv/ftp.debian.org/ftp";
-  TreeRootPath "/srv/ftp.debian.org/scratch/dsilvers/treeroots";
-  TreeDatabasePath "/srv/ftp.debian.org/scratch/dsilvers/treedbs";
+  FTPPath "/srv/ftp-master.debian.org/ftp";
+  TreeRootPath "/srv/ftp-master.debian.org/scratch/dsilvers/treeroots";
+  TreeDatabasePath "/srv/ftp-master.debian.org/scratch/dsilvers/treedbs";
   BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k };
   CombinationTrees
   {
@@ -81,12 +81,12 @@ Mirror-Split
 
 Show-New
 {
-  HTMLPath "/srv/ftp.debian.org/web/new/";
+  HTMLPath "/srv/ftp-master.debian.org/web/new/";
 }
 
 Show-Deferred
 {
-  LinkPath "/srv/ftp.debian.org/web/deferred/";
+  LinkPath "/srv/ftp-master.debian.org/web/deferred/";
   DeferredQueue "/srv/queued/DEFERRED/";
 }
 
@@ -126,13 +126,13 @@ Rm
    };
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-   LogFile "/srv/ftp.debian.org/web/removals.txt";
+   LogFile "/srv/ftp-master.debian.org/web/removals.txt";
    Bcc "removed-packages@qa.debian.org";
 };
 
 Import-Archive
 {
-  ExportDir "/srv/ftp.debian.org/dak/import-archive-files/";
+  ExportDir "/srv/ftp-master.debian.org/dak/import-archive-files/";
 };
 
 Import-Keyring
@@ -173,8 +173,8 @@ Clean-Suites
 
 Process-New
 {
-  DinstallLockFile "/srv/ftp.debian.org/lock/processnew.lock";
-  LockDir "/srv/ftp.debian.org/lock/new/";
+  DinstallLockFile "/srv/ftp-master.debian.org/lock/processnew.lock";
+  LockDir "/srv/ftp-master.debian.org/lock/new/";
 };
 
 Check-Overrides
@@ -234,8 +234,8 @@ Suite
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
-       CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/";
-       CommentsDir "/srv/ftp.debian.org/queue/p-u-new/COMMENTS/";
+       CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/";
+       CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/";
        Version "5.0-updates";
        Origin "Debian";
        Description "Debian 5.0 Proposed Updates - Not Released";
@@ -432,51 +432,51 @@ AutomaticByHandPackages {
     Source "debian-installer";
     Section "raw-installer";
     Extension "tar.gz";
-    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-di";
+    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-di";
   };
 
   "tag-overrides" {
     Source "tag-overrides";
     Section "byhand";
     Extension "tar.gz";
-    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-tag";
+    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-tag";
   };
 
   "task-overrides" {
     Source "tasksel";
     Section "byhand";
     Extension "tar.gz";
-    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-task";
+    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-task";
   };
 };
 
 Dir
 {
-  Root "/srv/ftp.debian.org/ftp/";
-  Pool "/srv/ftp.debian.org/ftp/pool/";
-  Templates "/srv/ftp.debian.org/dak/templates/";
+  Root "/srv/ftp-master.debian.org/ftp/";
+  Pool "/srv/ftp-master.debian.org/ftp/pool/";
+  Templates "/srv/ftp-master.debian.org/dak/templates/";
   PoolRoot "pool/";
-  Lists "/srv/ftp.debian.org/database/dists/";
-  Log "/srv/ftp.debian.org/log/";
-  Lock "/srv/ftp.debian.org/lock";
-  Morgue "/srv/ftp.debian.org/morgue/";
+  Lists "/srv/ftp-master.debian.org/database/dists/";
+  Log "/srv/ftp-master.debian.org/log/";
+  Lock "/srv/ftp-master.debian.org/lock";
+  Morgue "/srv/ftp-master.debian.org/morgue/";
   MorgueReject "reject";
-  Override "/srv/ftp.debian.org/scripts/override/";
+  Override "/srv/ftp-master.debian.org/scripts/override/";
   QueueBuild "/srv/incoming.debian.org/buildd/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
-  TempPath "/srv/ftp.debian.org/tmp/";
+  TempPath "/srv/ftp-master.debian.org/tmp/";
   Queue
   {
-    Byhand "/srv/ftp.debian.org/queue/byhand/";
-    ProposedUpdates "/srv/ftp.debian.org/queue/p-u-new/";
-    OldProposedUpdates "/srv/ftp.debian.org/queue/o-p-u-new/";
-    Done "/srv/ftp.debian.org/queue/done/";
-    Holding "/srv/ftp.debian.org/queue/holding/";
-    New "/srv/ftp.debian.org/queue/new/";
-    Reject "/srv/ftp.debian.org/queue/reject/";
-    Unchecked "/srv/ftp.debian.org/queue/unchecked/";
-    Newstage "/srv/ftp.debian.org/queue/newstage/";
-    BTSVersionTrack "/srv/ftp.debian.org/queue/bts_version_track/";
+    Byhand "/srv/ftp-master.debian.org/queue/byhand/";
+    ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
+    OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/";
+    Done "/srv/ftp-master.debian.org/queue/done/";
+    Holding "/srv/ftp-master.debian.org/queue/holding/";
+    New "/srv/ftp-master.debian.org/queue/new/";
+    Reject "/srv/ftp-master.debian.org/queue/reject/";
+    Unchecked "/srv/ftp-master.debian.org/queue/unchecked/";
+    Newstage "/srv/ftp-master.debian.org/queue/newstage/";
+    BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
     Embargoed "/does/not/exist/";
     Unembargoed "/does/not/exist/";
     Disembargo "/does/not/exist/";
@@ -487,7 +487,7 @@ Queue-Report
 {
   ReportLocations
   {
-    822Location "/srv/ftp.debian.org/web/new.822";
+    822Location "/srv/ftp-master.debian.org/web/new.822";
   };
 };
 
@@ -628,7 +628,7 @@ Location
 {
 
   // Pool locations on ftp-master.debian.org
-  /srv/ftp.debian.org/ftp/pool/
+  /srv/ftp-master.debian.org/ftp/pool/
     {
       Archive "ftp-master";
       Type "pool";
@@ -652,5 +652,5 @@ Urgency
 Contents
 {
   Header "contents";
-  Root "/srv/ftp.debian.org/test/";
+  Root "/srv/ftp-master.debian.org/test/";
 }

diff --git a/config/debian/dak.conf-etc b/config/debian/dak.conf-etc
index 351f9d2c763bf2b3780f7a741f2b736271a9c654..b0f6a50e63e4193a85e94dc102ef1f2b64bbbe4b 100644 (file)
--- a/config/debian/dak.conf-etc
+++ b/config/debian/dak.conf-etc
@@ -1,11 +1,11 @@
 Config
 {
-  ries.debian.org
+  franck.debian.org
   {
     AllowLocalConfig    "false";
     DatabaseHostname    "ftp-master";
-    DakConfig           "/srv/ftp.debian.org/dak/config/debian/dak.conf";
-    AptConfig           "/srv/ftp.debian.org/dak/config/debian/apt.conf";
+    DakConfig           "/srv/ftp-master.debian.org/dak/config/debian/dak.conf";
+    AptConfig           "/srv/ftp-master.debian.org/dak/config/debian/apt.conf";
   }
 }
 

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 6e5376bd888aab1c8dc39b822c9a78fbbcbc16af..aea863d28ffb2756d09d2f97964cb324a36ce725 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -96,7 +96,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.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)
@@ -313,7 +313,7 @@ function mkfilesindices() {
     ARCHLIST=$(tempfile)
 
     log "Querying projectb..."
-    echo 'SELECT l.path, f.filename, a.arch_string FROM location l JOIN files f ON (f.location = l.id) LEFT OUTER JOIN (binaries b JOIN architecture a ON (b.architecture = a.id)) ON (f.id = b.file)' | psql projectb -At | sed 's/|//;s,^/srv/ftp.debian.org/ftp,.,' | sort >$ARCHLIST
+    echo 'SELECT l.path, f.filename, a.arch_string FROM location l JOIN files f ON (f.location = l.id) LEFT OUTER JOIN (binaries b JOIN architecture a ON (b.architecture = a.id)) ON (f.id = b.file)' | psql projectb -At | sed 's/|//;s,^/srv/ftp-master.debian.org/ftp,.,' | sort >$ARCHLIST
 
     includedirs () {
         perl -ne 'print; while (m,/[^/]+$,) { $_=$`; print $_ . "\n" unless $d{$_}++; }'
@@ -362,7 +362,7 @@ function mkfilesindices() {
                     [ "$(readlink $distdir)" != "$distname" ] || echo $distdir
                 done
             )
-            suite_list $id | tr -d ' ' | sed 's,^/srv/ftp.debian.org/ftp,.,'
+            suite_list $id | tr -d ' ' | sed 's,^/srv/ftp-master.debian.org/ftp,.,'
         ) | sort -u | gzip --rsyncable -9 > suite-${suite}.list.gz
     done
 
@@ -472,9 +472,9 @@ function merkel3() {
 
 function mirrorpush() {
     log "Starting the mirrorpush"
-    date -u > /srv/ftp.debian.org/web/mirrorstart
-    echo "Using dak v1" >> /srv/ftp.debian.org/web/mirrorstart
-    echo "Running on host $(hostname -f)" >> /srv/ftp.debian.org/web/mirrorstart
+    date -u > /srv/ftp-master.debian.org/web/mirrorstart
+    echo "Using dak v1" >> /srv/ftp-master.debian.org/web/mirrorstart
+    echo "Running on host $(hostname -f)" >> /srv/ftp-master.debian.org/web/mirrorstart
     sudo -H -u archvsync /home/archvsync/runmirrors > ~dak/runmirrors.log 2>&1 &
 }
 
@@ -487,7 +487,7 @@ function i18n2() {
     dak control-suite -l testing > squeeze
     dak control-suite -l unstable > sid
     echo "${STAMP}" > timestamp
-    gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.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 55BE302B --detach-sign -o timestamp.gpg timestamp
     rm -f md5sum
     md5sum * > md5sum
     cd ${webdir}/

diff --git a/config/debian/vars b/config/debian/vars
index 35e9f0e5eb2dbe90972079da2c4ac155307e88a0..d6e4cbe1d751b4e3e8b424cb8bbf727f5df13992 100644 (file)
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -1,6 +1,6 @@
 # locations used by many scripts
 
-base=/srv/ftp.debian.org
+base=/srv/ftp-master.debian.org
 bindir=$base/bin
 ftpdir=$base/ftp
 webdir=$base/web