From 6f984c8f09377f51ea631e9bbfcd9ab02a39f993 Mon Sep 17 00:00:00 2001 From: James Troup Date: Thu, 8 Feb 2007 00:52:33 +0000 Subject: [PATCH] [rmurray] Migrate from /org to /srv for debian.org config. --- ChangeLog | 12 ++++++ config/debian/apt.conf | 36 +++++++++--------- config/debian/apt.conf.buildd | 10 ++--- config/debian/apt.conf.stable | 14 +++---- config/debian/cron.daily | 2 +- config/debian/cron.hourly | 2 +- config/debian/cron.monthly | 4 +- config/debian/cron.unchecked | 2 +- config/debian/cron.weekly | 2 +- config/debian/dak.conf | 72 +++++++++++++++++------------------ config/debian/vars | 2 +- scripts/debian/mkfilesindices | 6 +-- 12 files changed, 88 insertions(+), 76 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9e57031..4b704de3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,18 @@ * scripts/debian/mkfilesindices: source 'vars' file and use it's variables instead of hardcoding path names. + * config/debian/apt.conf: switch from /org to /srv. + * config/debian/apt.conf.buildd: likewise. + * config/debian/apt.conf.stable: likewise. + * config/debian/cron.daily: likewise. + * config/debian/cron.hourly: likewise. + * config/debian/cron.monthly: likewise. + * config/debian/cron.unchecked: likewise. + * config/debian/cron.weekly: likewise. + * config/debian/dak.conf: likewise. + * config/debian/vars: likewise. + * scripts/debian/mkfilesindices: likewise. + 2007-02-08 James Troup * dak/process_unchecked.py (check_signed_by_key): new function to diff --git a/config/debian/apt.conf b/config/debian/apt.conf index 564a758c..4ec1cd2c 100644 --- a/config/debian/apt.conf +++ b/config/debian/apt.conf @@ -1,8 +1,8 @@ Dir { - ArchiveDir "/org/ftp.debian.org/ftp/"; - OverrideDir "/org/ftp.debian.org/scripts/override/"; - CacheDir "/org/ftp.debian.org/database/"; + ArchiveDir "/srv/ftp.debian.org/ftp/"; + OverrideDir "/srv/ftp.debian.org/scripts/override/"; + CacheDir "/srv/ftp.debian.org/database/"; }; Default @@ -17,13 +17,13 @@ Default TreeDefault { - Contents::Header "/org/ftp.debian.org/dak/config/debian/Contents.top"; + Contents::Header "/srv/ftp.debian.org/dak/config/debian/Contents.top"; }; tree "dists/proposed-updates" { - FileList "/org/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_source.list"; + 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"; Sections "main contrib non-free"; Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; BinOverride "override.sarge.$(SECTION)"; @@ -35,8 +35,8 @@ tree "dists/proposed-updates" tree "dists/testing" { FakeDI "dists/unstable"; - FileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_source.list"; + FileList "/srv/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list"; + SourceFileList "/srv/ftp.debian.org/database/dists/testing_$(SECTION)_source.list"; Sections "main contrib non-free"; Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; BinOverride "override.etch.$(SECTION)"; @@ -48,8 +48,8 @@ tree "dists/testing" tree "dists/testing-proposed-updates" { - FileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list"; + 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"; Sections "main contrib non-free"; Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; BinOverride "override.etch.$(SECTION)"; @@ -60,8 +60,8 @@ tree "dists/testing-proposed-updates" tree "dists/unstable" { - FileList "/org/ftp.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/ftp.debian.org/database/dists/unstable_$(SECTION)_source.list"; + FileList "/srv/ftp.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list"; + SourceFileList "/srv/ftp.debian.org/database/dists/unstable_$(SECTION)_source.list"; Sections "main contrib non-free"; Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc source"; BinOverride "override.sid.$(SECTION)"; @@ -75,7 +75,7 @@ tree "dists/unstable" tree "dists/proposed-updates/main" { - FileList "/org/ftp.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list"; + FileList "/srv/ftp.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list"; Sections "debian-installer"; Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"; BinOverride "override.sarge.main.$(SECTION)"; @@ -87,7 +87,7 @@ tree "dists/proposed-updates/main" tree "dists/testing/main" { - FileList "/org/ftp.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list"; + FileList "/srv/ftp.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list"; Sections "debian-installer"; Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"; BinOverride "override.etch.main.$(SECTION)"; @@ -99,7 +99,7 @@ tree "dists/testing/main" tree "dists/testing-proposed-updates/main" { - FileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list"; + FileList "/srv/ftp.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list"; Sections "debian-installer"; Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"; BinOverride "override.etch.main.$(SECTION)"; @@ -111,7 +111,7 @@ tree "dists/testing-proposed-updates/main" tree "dists/unstable/main" { - FileList "/org/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list"; + FileList "/srv/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list"; Sections "debian-installer"; Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc"; BinOverride "override.sid.main.$(SECTION)"; @@ -125,8 +125,8 @@ tree "dists/unstable/main" tree "dists/experimental" { - FileList "/org/ftp.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/ftp.debian.org/database/dists/experimental_$(SECTION)_source.list"; + FileList "/srv/ftp.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list"; + SourceFileList "/srv/ftp.debian.org/database/dists/experimental_$(SECTION)_source.list"; Sections "main contrib non-free"; Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc source"; BinOverride "override.sid.$(SECTION)"; diff --git a/config/debian/apt.conf.buildd b/config/debian/apt.conf.buildd index 9ea04491..e064f77e 100644 --- a/config/debian/apt.conf.buildd +++ b/config/debian/apt.conf.buildd @@ -1,8 +1,8 @@ Dir { - ArchiveDir "/org/incoming.debian.org/buildd/"; - OverrideDir "/org/ftp.debian.org/scripts/override/"; - CacheDir "/org/ftp.debian.org/database/"; + ArchiveDir "/srv/incoming.debian.org/buildd/"; + OverrideDir "/srv/ftp.debian.org/scripts/override/"; + CacheDir "/srv/ftp.debian.org/database/"; }; Default @@ -21,7 +21,7 @@ bindirectory "incoming" BinOverride "override.sid.all3"; BinCacheDB "packages-accepted.db"; - FileList "/org/ftp.debian.org/database/dists/unstable_accepted.list"; + FileList "/srv/ftp.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"; - SourceFileList "/org/ftp.debian.org/database/dists/unstable_accepted.list"; + SourceFileList "/srv/ftp.debian.org/database/dists/unstable_accepted.list"; }; diff --git a/config/debian/apt.conf.stable b/config/debian/apt.conf.stable index 1d836295..a8519946 100644 --- a/config/debian/apt.conf.stable +++ b/config/debian/apt.conf.stable @@ -1,8 +1,8 @@ Dir { - ArchiveDir "/org/ftp.debian.org/ftp/"; - OverrideDir "/org/ftp.debian.org/scripts/override/"; - CacheDir "/org/ftp.debian.org/database/"; + ArchiveDir "/srv/ftp.debian.org/ftp/"; + OverrideDir "/srv/ftp.debian.org/scripts/override/"; + CacheDir "/srv/ftp.debian.org/database/"; }; Default @@ -16,13 +16,13 @@ Default TreeDefault { - Contents::Header "/org/ftp.debian.org/dak/config/debian/Contents.top"; + Contents::Header "/srv/ftp.debian.org/dak/config/debian/Contents.top"; }; tree "dists/stable" { - FileList "/org/ftp.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/ftp.debian.org/database/dists/stable_$(SECTION)_source.list"; + FileList "/srv/ftp.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list"; + SourceFileList "/srv/ftp.debian.org/database/dists/stable_$(SECTION)_source.list"; Sections "main contrib non-free"; Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; BinOverride "override.sarge.$(SECTION)"; @@ -34,7 +34,7 @@ tree "dists/stable" tree "dists/stable/main" { - FileList "/org/ftp.debian.org/database/dists/stable_main_$(SECTION)_binary-$(ARCH).list"; + FileList "/srv/ftp.debian.org/database/dists/stable_main_$(SECTION)_binary-$(ARCH).list"; Sections "debian-installer"; Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"; BinOverride "override.sarge.main.$(SECTION)"; diff --git a/config/debian/cron.daily b/config/debian/cron.daily index 08825252..333f4e09 100755 --- a/config/debian/cron.daily +++ b/config/debian/cron.daily @@ -3,7 +3,7 @@ # Executed daily via cron, out of dak's crontab. set -e -export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars +export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars . $SCRIPTVARS ################################################################################ diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly index 59104c3a..b313ac0a 100644 --- a/config/debian/cron.hourly +++ b/config/debian/cron.hourly @@ -4,7 +4,7 @@ set -e set -u -export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars +export SCRIPTVARS=/srv/ftp.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 9d7a68ba..cdc76be2 100755 --- a/config/debian/cron.monthly +++ b/config/debian/cron.monthly @@ -4,14 +4,14 @@ set -e set -u -export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars +export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars . $SCRIPTVARS ################################################################################ DATE=`date -d yesterday +%y%m` -cd /org/ftp.debian.org/mail/archive +cd /srv/ftp.debian.org/mail/archive for m in mail bxamail; do if [ -f $m ]; then mv $m ${m}-$DATE diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked index 7eddf086..04b06156 100644 --- a/config/debian/cron.unchecked +++ b/config/debian/cron.unchecked @@ -2,7 +2,7 @@ set -e set -u -export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars +export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars . $SCRIPTVARS LOCKDAILY="" diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly index 2c159380..53c866f2 100755 --- a/config/debian/cron.weekly +++ b/config/debian/cron.weekly @@ -4,7 +4,7 @@ set -e set -u -export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars +export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars . $SCRIPTVARS ################################################################################ diff --git a/config/debian/dak.conf b/config/debian/dak.conf index 6615e9f9..7a6364bb 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -1,9 +1,9 @@ Dinstall { - PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp"; - GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; - SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; - SigningPubKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; + PGPKeyring "/srv/keyring.debian.org/keyrings/debian-keyring.pgp"; + GPGKeyring "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; + SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; + SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; SigningKeyIds "2D230C5F"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; @@ -13,7 +13,7 @@ Dinstall BugServer "bugs.debian.org"; PackagesServer "packages.debian.org"; TrackingServer "packages.qa.debian.org"; - LockFile "/org/ftp.debian.org/lock/dinstall.lock"; + LockFile "/srv/ftp.debian.org/lock/dinstall.lock"; Bcc "archive@ftp-master.debian.org"; GroupOverrideFilename "override.group-maint"; FutureTimeTravelGrace 28800; // 8 hours @@ -61,7 +61,7 @@ Generate-Index-Diffs { Options { - TempDir "/org/ftp.debian.org/tiffani"; + TempDir "/srv/ftp.debian.org/tiffani"; MaxDiffs { Default 90; }; }; }; @@ -73,9 +73,9 @@ Override Mirror-Split { - FTPPath "/org/ftp.debian.org/ftp"; - TreeRootPath "/org/ftp.debian.org/scratch/dsilvers/treeroots"; - TreeDatabasePath "/org/ftp.debian.org/scratch/dsilvers/treedbs"; + FTPPath "/srv/ftp.debian.org/ftp"; + TreeRootPath "/srv/ftp.debian.org/scratch/dsilvers/treeroots"; + TreeDatabasePath "/srv/ftp.debian.org/scratch/dsilvers/treedbs"; BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k }; CombinationTrees { @@ -121,13 +121,13 @@ Rm }; MyEmailAddress "Debian Archive Maintenance "; - LogFile "/org/ftp.debian.org/web/removals.txt"; + LogFile "/srv/ftp.debian.org/web/removals.txt"; Bcc "removed-packages@qa.debian.org"; }; Import-Archive { - ExportDir "/org/ftp.debian.org/dak/import-archive-files/"; + ExportDir "/srv/ftp.debian.org/dak/import-archive-files/"; }; Reject-Proposed-Updates @@ -142,9 +142,9 @@ Import-LDAP-Fingerprints LDAPServer "db.debian.org"; ExtraKeyrings { - "/org/keyring.debian.org/keyrings/removed-keys.pgp"; - "/org/keyring.debian.org/keyrings/removed-keys.gpg"; - "/org/keyring.debian.org/keyrings/extra-keys.pgp"; + "/srv/keyring.debian.org/keyrings/removed-keys.pgp"; + "/srv/keyring.debian.org/keyrings/removed-keys.gpg"; + "/srv/keyring.debian.org/keyrings/extra-keys.pgp"; }; KeyServer "wwwkeys.eu.pgp.net"; }; @@ -159,7 +159,7 @@ Clean-Suites Process-New { - AcceptedLockFile "/org/ftp.debian.org/lock/unchecked.lock"; + AcceptedLockFile "/srv/ftp.debian.org/lock/unchecked.lock"; }; Check-Overrides @@ -285,7 +285,7 @@ Suite }; Announce "debian-changes@lists.debian.org"; CopyChanges "dists/proposed-updates/"; - CopyDotDak "/org/ftp.debian.org/queue/proposed-updates/"; + CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/"; Version "3.1-updates"; Origin "Debian"; Description "Debian 3.1 Proposed Updates - Not Released"; @@ -523,29 +523,29 @@ SuiteMappings Dir { - Root "/org/ftp.debian.org/ftp/"; - Pool "/org/ftp.debian.org/ftp/pool/"; - Templates "/org/ftp.debian.org/dak/templates/"; + Root "/srv/ftp.debian.org/ftp/"; + Pool "/srv/ftp.debian.org/ftp/pool/"; + Templates "/srv/ftp.debian.org/dak/templates/"; PoolRoot "pool/"; - Lists "/org/ftp.debian.org/database/dists/"; - Log "/org/ftp.debian.org/log/"; - Lock "/org/ftp.debian.org/lock"; - Morgue "/org/ftp.debian.org/morgue/"; + 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/"; MorgueReject "reject"; - Override "/org/ftp.debian.org/scripts/override/"; - QueueBuild "/org/incoming.debian.org/buildd/"; - UrgencyLog "/org/ftp.debian.org/testing/urgencies/"; + Override "/srv/ftp.debian.org/scripts/override/"; + QueueBuild "/srv/incoming.debian.org/buildd/"; + UrgencyLog "/srv/ftp.debian.org/testing/urgencies/"; Queue { - Accepted "/org/ftp.debian.org/queue/accepted/"; - Byhand "/org/ftp.debian.org/queue/byhand/"; - ProposedUpdates "/org/ftp.debian.org/queue/p-u-new/"; - Done "/org/ftp.debian.org/queue/done/"; - Holding "/org/ftp.debian.org/queue/holding/"; - New "/org/ftp.debian.org/queue/new/"; - Reject "/org/ftp.debian.org/queue/reject/"; - Unchecked "/org/ftp.debian.org/queue/unchecked/"; - BTSVersionTrack "/org/ftp.debian.org/queue/bts_version_track/"; + Accepted "/srv/ftp.debian.org/queue/accepted/"; + Byhand "/srv/ftp.debian.org/queue/byhand/"; + ProposedUpdates "/srv/ftp.debian.org/queue/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/"; + BTSVersionTrack "/srv/ftp.debian.org/queue/bts_version_track/"; }; }; @@ -678,7 +678,7 @@ Location { // Pool locations on ftp-master.debian.org - /org/ftp.debian.org/ftp/pool/ + /srv/ftp.debian.org/ftp/pool/ { Archive "ftp-master"; Type "pool"; diff --git a/config/debian/vars b/config/debian/vars index 59fd6b31..c0f3efb4 100644 --- a/config/debian/vars +++ b/config/debian/vars @@ -1,6 +1,6 @@ # locations used by many scripts -base=/org/ftp.debian.org +base=/srv/ftp.debian.org ftpdir=$base/ftp webdir=$base/web indices=$ftpdir/indices diff --git a/scripts/debian/mkfilesindices b/scripts/debian/mkfilesindices index c5ac1d9e..34d1b6bc 100755 --- a/scripts/debian/mkfilesindices +++ b/scripts/debian/mkfilesindices @@ -1,6 +1,6 @@ #!/bin/sh -e -export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars +export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars . $SCRIPTVARS umask 002 @@ -10,7 +10,7 @@ ARCHLIST=$(tempfile) echo "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/|all$/|/;s,^/org/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/|all$/|/;s,^/srv/ftp.debian.org/ftp,.,' | sort >$ARCHLIST includedirs () { perl -ne 'print; while (m,/[^/]+$,) { $_=$`; print $_ . "\n" unless $d{$_}++; }' @@ -63,7 +63,7 @@ printf 'SELECT id, suite_name FROM suite\n' | psql -F' ' -At projectb | [ "$(readlink $distdir)" != "$distname" ] || echo $distdir done ) - suite_list $id | tr -d ' ' | sed 's,^/org/ftp.debian.org/ftp,.,' + suite_list $id | tr -d ' ' | sed 's,^/srv/ftp.debian.org/ftp,.,' ) | sort -u | gzip -9 > suite-${suite}.list.gz done -- 2.39.5