[dak/master] Path changes
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
config/backports/Contents.top | 6 +-
config/backports/apt.conf | 20 ++++----
config/backports/bpo-copy-packages | 2 +-
config/backports/cron.buildd | 4 +-
config/backports/cron.daily | 6 +-
config/backports/cron.hourly | 12 ++--
config/backports/cron.monthly | 2 +-
config/backports/cron.unchecked | 2 +-
config/backports/cron.weekly | 2 +-
config/backports/dak.conf | 90 ++++++++++++++++++------------------
config/backports/vars | 8 ++--
11 files changed, 77 insertions(+), 77 deletions(-)
diff --git a/config/backports/Contents.top b/config/backports/Contents.top
index ee791eb..e03f7a6 100644
--- a/config/backports/Contents.top
+++ b/config/backports/Contents.top
@@ -1,6 +1,6 @@
-This file maps each file available in the backports.org archive system to
-the package from which it originates. It includes packages from the
-DIST distribution for the ARCH architecture.
+This file maps each file available in the backports.debian.org archive
+system to the package from which it originates. It includes packages
+from the DIST distribution for the ARCH architecture.
You can use this list to determine which package contains a specific
file, or whether or not a specific file is available. The list is
diff --git a/config/backports/apt.conf b/config/backports/apt.conf
index 1fe25ae..6f9d67b 100644
--- a/config/backports/apt.conf
+++ b/config/backports/apt.conf
@@ -1,8 +1,8 @@
Dir
{
- ArchiveDir "/org/backports.org/ftp/";
- OverrideDir "/org/backports.org/scripts/override/";
- CacheDir "/org/backports.org/database/";
+ ArchiveDir "/srv/backports-master.debian.org/ftp/";
+ OverrideDir "/srv/backports-master.debian.org/scripts/override/";
+ CacheDir "/srv/backports-master.debian.org/database/";
};
Default
@@ -17,13 +17,13 @@ Default
TreeDefault
{
- Contents::Header "/org/backports.org/dak-config/Contents.top";
+ Contents::Header "/srv/backports-master.debian.org/dak/config/backports/Contents.top";
};
tree "dists/lenny-backports"
{
- FileList "/org/backports.org/database/dists/lenny-backports_$(SECTION)_binary-$(ARCH).list";
- SourceFileList "/org/backports.org/database/dists/lenny-backports_$(SECTION)_source.list";
+ FileList "/srv/backports-master.debian.org/database/dists/lenny-backports_$(SECTION)_binary-$(ARCH).list";
+ SourceFileList "/srv/backports-master.debian.org/database/dists/lenny-backports_$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source";
BinOverride "override.lenny-backports.$(SECTION)";
@@ -35,7 +35,7 @@ tree "dists/lenny-backports"
tree "dists/lenny-backports/main"
{
- FileList "/org/backports.org/database/dists/lenny-backports_main_$(SECTION)_binary-$(ARCH).list";
+ FileList "/srv/backports-master.debian.org/database/dists/lenny-backports_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source";
BinOverride "override.lenny-backports.main.$(SECTION)";
@@ -47,8 +47,8 @@ tree "dists/lenny-backports/main"
tree "dists/etch-backports"
{
- FileList "/org/backports.org/database/dists/etch-backports_$(SECTION)_binary-$(ARCH).list";
- SourceFileList "/org/backports.org/database/dists/etch-backports_$(SECTION)_source.list";
+ FileList "/srv/backports-master.debian.org/database/dists/etch-backports_$(SECTION)_binary-$(ARCH).list";
+ SourceFileList "/srv/backports-master.debian.org/database/dists/etch-backports_$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc source";
BinOverride "override.etch-backports.$(SECTION)";
@@ -60,7 +60,7 @@ tree "dists/etch-backports"
tree "dists/etch-backports/main"
{
- FileList "/org/backports.org/database/dists/etch-backports_main_$(SECTION)_binary-$(ARCH).list";
+ FileList "/srv/backports-master.debian.org/database/dists/etch-backports_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc source";
BinOverride "override.etch-backports.main.$(SECTION)";
diff --git a/config/backports/bpo-copy-packages b/config/backports/bpo-copy-packages
index 6753705..7bbeb3c 100755
--- a/config/backports/bpo-copy-packages
+++ b/config/backports/bpo-copy-packages
@@ -4,7 +4,7 @@
# WARNING: spaces in filenames/paths considered harmful.
-export SCRIPTVARS=/org/backports.org/dak/config/backports.org/vars
+export SCRIPTVARS=/srv/backports-master.debian.org/dak/config/backports.org/vars
. $SCRIPTVARS
cd ${configdir}
diff --git a/config/backports/cron.buildd b/config/backports/cron.buildd
index 218ee88..36ea8a3 100755
--- a/config/backports/cron.buildd
+++ b/config/backports/cron.buildd
@@ -4,8 +4,8 @@
# stolen from newraff and adjusted by aba on 2005-04-30
#exit 0
-export SCRIPTVARS=/org/backports.org/dak-config/vars
+export SCRIPTVARS=/srv/backports-master.debian.org/config/backports/vars
. $SCRIPTVARS
-#ssh -i $base/s3kr1t/dot-ssh/id_rsa wanna-build@wanna-build.farm.ftbfs.de echo broken
+
ssh -i $base/s3kr1t/dot-ssh/id_rsa wbadm@buildd.debian.org echo broken
exit 0
diff --git a/config/backports/cron.daily b/config/backports/cron.daily
index b84d801..eaffdf5 100755
--- a/config/backports/cron.daily
+++ b/config/backports/cron.daily
@@ -3,7 +3,7 @@
# Executed daily via cron, out of katie's crontab.
set -e
-export SCRIPTVARS=/org/backports.org/dak-config/vars
+export SCRIPTVARS=/srv/backports-master.debian.org/config/backports/vars
. $SCRIPTVARS
################################################################################
@@ -12,8 +12,8 @@ dak clean-suites
dak clean-queues
# Send a report on NEW/BYHAND packages
-dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@backports.org
+dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@backports.debian.org
# and one on crufty packages
-dak cruft-report | tee $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@backports.org
+dak cruft-report | tee $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@backports.debian.org
echo Daily cron scripts successful.
diff --git a/config/backports/cron.hourly b/config/backports/cron.hourly
index a43c62c..3f52806 100755
--- a/config/backports/cron.hourly
+++ b/config/backports/cron.hourly
@@ -2,7 +2,7 @@
#
# Executed daily via cron, out of katie's crontab.
set -e
-export SCRIPTVARS=/org/backports.org/dak-config/vars
+export SCRIPTVARS=/srv/backports-master.debian.org/config/backports/vars
. $SCRIPTVARS
################################################################################
@@ -41,7 +41,7 @@ EOF
cd $accepted
rm -f REPORT
dak process-accepted -pa *.changes | tee REPORT | \
- mail -s "Install for $(date +%d.%m.%Y)" ftpmaster@backports.org
+ mail -s "Install for $(date +%d.%m.%Y)" ftpmaster@backports.debian.org
chgrp debadmin REPORT
chmod 664 REPORT
@@ -87,9 +87,9 @@ echo Archive maintenance finished at $(date +%X)
################################################################################
echo "Creating post-hourly-cron-job backup of projectb database..."
-POSTDUMP=/org/backports.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
+POSTDUMP=/srv/backports-master.debian.org/backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
pg_dump projectb > $POSTDUMP
-(cd /org/backports.org/backup; ln -sf $POSTDUMP current)
+(cd /srv/backports-master.debian.org/backup; ln -sf $POSTDUMP current)
################################################################################
@@ -106,7 +106,7 @@ echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE: Skippin
################################################################################
-(cd /org/backports.org/stats; rm -f master.list; ./dmc.pl get >/dev/null 2>&1; \
+(cd /srv/backports-master.debian.org/stats; rm -f master.list; ./dmc.pl get >/dev/null 2>&1; \
./mirror.pl>$ftpdir/README.mirrors.html; cd $ftpdir; /usr/bin/links -dump README.mirrors.html >README.mirrors.txt)
@@ -114,6 +114,6 @@ echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE: Skippin
ulimit -m 90000 -d 90000 -s 10000 -v 90000
-run-parts --report /org/backports.org/scripts/distmnt
+run-parts --report /srv/backports-master.debian.org/scripts/distmnt
echo Daily cron scripts successful.
diff --git a/config/backports/cron.monthly b/config/backports/cron.monthly
index f604936..76b13b1 100755
--- a/config/backports/cron.monthly
+++ b/config/backports/cron.monthly
@@ -3,7 +3,7 @@
# Run at the beginning of the month via cron, out of katie's crontab.
set -e
-export SCRIPTVARS=/org/backports.org/dak-config/vars
+export SCRIPTVARS=/srv/backports-master.debian.org/config/backports/vars
. $SCRIPTVARS
################################################################################
diff --git a/config/backports/cron.unchecked b/config/backports/cron.unchecked
index bb2337e..78eccd1 100755
--- a/config/backports/cron.unchecked
+++ b/config/backports/cron.unchecked
@@ -1,6 +1,6 @@
#! /bin/sh
set -e
-export SCRIPTVARS=/org/backports.org/dak-config/vars
+export SCRIPTVARS=/srv/backports-master.debian.org/config/backports/vars
. $SCRIPTVARS
LOCKFILE="$lockdir/unchecked.lock"
diff --git a/config/backports/cron.weekly b/config/backports/cron.weekly
index 0ab9afd..9a563aa 100755
--- a/config/backports/cron.weekly
+++ b/config/backports/cron.weekly
@@ -3,7 +3,7 @@
# Run once a week via cron, out of katie's crontab.
set -e
-export SCRIPTVARS=/org/backports.org/dak-config/vars
+export SCRIPTVARS=/srv/backports-master.debian.org/config/backports/vars
. $SCRIPTVARS
################################################################################
diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 31ef697..c1980ad 100644
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -3,27 +3,27 @@ Dinstall
// Both need to be defined at the moment, but they can point to the
// same file.
GPGKeyring {
- "/org/backports.org/keyrings/keyring.gpg";
+ "/srv/backports-master.debian.org/keyrings/keyring.gpg";
};
// To sign the release files. Adjust the keyid!
// Note: Key must be without a passphrase or it wont work automagically!
- SigningKeyring "/org/backports.org/s3kr1t/dot-gnupg/secring.gpg";
- SigningPubKeyring "/org/backports.org/s3kr1t/dot-gnupg/pubring.gpg";
+ SigningKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
+ SigningPubKeyring "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
SigningKeyIds "16BA136C";
SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
- MyEmailAddress "Backports.org archive Installer <installer@backports.org>";
- MyAdminAddress "ftpmaster@backports.org";
- MyHost "backports.org"; // used for generating user@my_host addresses in e.g. manual_reject()
- MyDistribution "Backports.org archive"; // Used in emails
+ MyEmailAddress "backports.debian.org archive Installer <installer@backports.debian.org>";
+ MyAdminAddress "ftpmaster@backports.debian.org";
+ MyHost "backports.debian.org"; // used for generating user@my_host addresses in e.g. manual_reject()
+ MyDistribution "backports.debian.org archive"; // Used in emails
// Alicia and melanie can use it
- BugServer "bugs.backports.org";
+ BugServer "bugs.debian.org";
// melanie uses the packages server.
// PackagesServer "packages.test.backports.org";
// If defined then the package@this.server gets a copy of most of the
// actions related to the package. For an example look at
// packages.qa.debian.org
// TrackingServer "packages.qa.test.backports.org";
- LockFile "/org/backports.org/lock/dinstall.lock";
+ LockFile "/srv/backports-master.debian.org/lock/dinstall.lock";
// If defined this address gets a bcc of all mails.
// FIXME: Einrichten wenn das hier produktiv geht!
Bcc "backports-archive@lists.backports.org";
@@ -38,24 +38,24 @@ Dinstall
Reject
{
NoSourceOnly "true";
- ReleaseTransitions "/org/backports.org/hints/transitions.yaml";
+ ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml";
};
// If set, only send mails to addresses listed there.
- MailWhiteList "/org/backports.org/dak/config/backports.org/mail-whitelist";
+ MailWhiteList "/srv/backports-master.debian.org/dak/config/backports/mail-whitelist";
};
Generate-Index-Diffs
{
Options
{
- TempDir "/org/backports.org/tiffani";
+ TempDir "/srv/backports-master.debian.org/tiffani";
MaxDiffs { Default 50; };
};
};
Override
{
- MyEmailAddress "Backports.org archive FTP Masters <ftpmaster@backports.org>";
+ MyEmailAddress "backports.debian.org archive FTP Masters <ftpmaster@backports.debian.org>";
};
Add-User
@@ -138,13 +138,13 @@ Rm
Suite "etch-backports";
};
- MyEmailAddress "Backports.org archive Maintenance <ftpmaster@backports.org>";
- LogFile "/org/backports.org/ftp/removals.txt";
+ MyEmailAddress "backports.debian.org archive Maintenance <ftpmaster@backports.debian.org>";
+ LogFile "/srv/backports-master.debian.org/ftp/removals.txt";
};
Import-Archive
{
- ExportDir "/org/backports.org/dak/import-archive-files/";
+ ExportDir "/srv/backports-master.debian.org/dak/import-archive-files/";
};
Clean-Suites
@@ -157,7 +157,7 @@ Clean-Suites
Process-New
{
- AcceptedLockFile "/org/backports.org/lock/unchecked.lock";
+ AcceptedLockFile "/srv/backports-master.debian.org/lock/unchecked.lock";
};
Suite
@@ -172,7 +172,7 @@ Suite
};
Announce "backports-changes@lists.backports.org";
- Origin "Backports.org archive";
+ Origin "backports.debian.org archive";
Description "Backports for the Lenny Distribution";
CodeName "lenny-backports";
OverrideCodeName "lenny-backports";
@@ -189,7 +189,7 @@ Suite
non-free;
};
Announce "backports-changes@lists.backports.org";
- Origin "Backports.org archive";
+ Origin "backports.debian.org archive";
Description "Backports for the Etch Distribution";
CodeName "etch-backports";
OverrideCodeName "etch-backports";
@@ -201,31 +201,31 @@ Suite
Dir
{
- Root "/org/backports.org/ftp/";
- Pool "/org/backports.org/ftp/pool/";
- Templates "/org/backports.org/dak/templates/";
+ Root "/srv/backports-master.debian.org/ftp/";
+ Pool "/srv/backports-master.debian.org/ftp/pool/";
+ Templates "/srv/backports-master.debian.org/dak/templates/";
PoolRoot "pool/";
- Lists "/org/backports.org/database/dists/";
- Log "/org/backports.org/log/";
- Morgue "/org/backports.org/morgue/";
+ Lists "/srv/backports-master.debian.org/database/dists/";
+ Log "/srv/backports-master.debian.org/log/";
+ Morgue "/srv/backports-master.debian.org/morgue/";
MorgueReject "reject";
- Lock "/org/backports.org/lock";
- Override "/org/backports.org/scripts/override/";
- UrgencyLog "/org/backports.org/testing/urgencies/";
+ Lock "/srv/backports-master.debian.org/lock";
+ Override "/srv/backports-master.debian.org/scripts/override/";
+ UrgencyLog "/srv/backports-master.debian.org/testing/urgencies/";
Queue
{
- Accepted "/org/backports.org/queue/accepted/";
- Byhand "/org/backports.org/queue/byhand/";
- Done "/org/backports.org/queue/done/";
- Holding "/org/backports.org/queue/holding/";
- New "/org/backports.org/queue/new/";
- ProposedUpdates "/org/backports.org/queue/p-u-new/";
- Reject "/org/backports.org/queue/reject/";
- Unchecked "/org/backports.org/queue/unchecked/";
- BTSVersionTrack "/org/backports.org/queue/bts_version_track/";
- Embargoed "/org/backports.org/queue/Embargoed/";
- Unembargoed "/org/backports.org/queue/Unembargoed/";
- OldProposedUpdates "/org/backports.org/queue/Unembargoed/";
+ Accepted "/srv/backports-master.debian.org/queue/accepted/";
+ Byhand "/srv/backports-master.debian.org/queue/byhand/";
+ Done "/srv/backports-master.debian.org/queue/done/";
+ Holding "/srv/backports-master.debian.org/queue/holding/";
+ New "/srv/backports-master.debian.org/queue/new/";
+ ProposedUpdates "/srv/backports-master.debian.org/queue/p-u-new/";
+ Reject "/srv/backports-master.debian.org/queue/reject/";
+ Unchecked "/srv/backports-master.debian.org/queue/unchecked/";
+ BTSVersionTrack "/srv/backports-master.debian.org/queue/bts_version_track/";
+ Embargoed "/srv/backports-master.debian.org/queue/Embargoed/";
+ Unembargoed "/srv/backports-master.debian.org/queue/Unembargoed/";
+ OldProposedUpdates "/srv/backports-master.debian.org/queue/Unembargoed/";
};
};
@@ -281,9 +281,9 @@ Archive
{
backports
{
- OriginServer "backports.org";
- PrimaryMirror "backports.org";
- Description "Master Archive for Backports.org archive";
+ OriginServer "backports.debian.org";
+ PrimaryMirror "backports.debian.org";
+ Description "Master Archive for backports.debian.org archive";
};
};
@@ -384,8 +384,8 @@ OverrideType
Location
{
- // Pool locations on backports.org
- /org/backports.org/ftp/pool/
+ // Pool locations on backports.debian.org
+ /srv/backports-master.debian.org/ftp/pool/
{
Archive "backports";
Type "pool";
diff --git a/config/backports/vars b/config/backports/vars
index e61a11b..53e557e 100644
--- a/config/backports/vars
+++ b/config/backports/vars
@@ -1,6 +1,6 @@
# locations used by many scripts
-base=/org/backports.org
+base=/srv/backports-master.debian.org
ftpdir=$base/ftp/
webdir=$base/web
@@ -37,9 +37,9 @@ suites="lenny-backports"
override_types="deb dsc udeb"
# temporary fix only!
-# export TMP=/org/backports.org/tmp
-# export TEMP=/org/backports.org/tmp
-# export TMPDIR==/org/backports.org/tmp
+# export TMP=/srv/backports-master.debian.org/tmp
+# export TEMP=/srv/backports-master.debian.org/tmp
+# export TMPDIR==/srv/backports-master.debian.org/tmp
PATH=$masterdir:$PATH
umask 022
--
1.5.6.5
Reply to: