X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=50390f5b4b261371ab49c90e12712e8bfaebb223;hb=6c92853af8a7ca65fad19cb0f1a0ffaecec48fb7;hp=f0f4893131716262c23dc5f5d9890f792aaae61e;hpb=393a765cb3d56e8618385efffce776baf3a5c242;p=dak.git diff --git a/config/debian/dak.conf b/config/debian/dak.conf index f0f48931..50390f5b 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -1,10 +1,12 @@ 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"; - SigningKeyIds "2D230C5F"; + GPGKeyrings { + "/srv/keyring.debian.org/keyrings/debian-keyring.gpg"; + "/srv/keyring.debian.org/keyrings/debian-keyring.pgp"; + }; + SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg"; + SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg"; + SigningKeyIds "6070D3A1"; SendmailCommand "/usr/sbin/sendmail -odq -oi -t"; MyEmailAddress "Debian Installer "; MyAdminAddress "ftpmaster@debian.org"; @@ -13,9 +15,8 @@ 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 PastCutoffYear "1984"; SkipTime 300; @@ -34,12 +35,35 @@ Dinstall }; }; +Binary-Upload-Restrictions +{ + Components + { + main; + contrib; + }; + unstable + { + arm + { + 9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5; + 70BC7F9D8C60D2265B7076A23760DBCFFD6645AB; + F849E2025D1C194DE62BC6C829BE5D2268FD549F; + }; + alpha + { + 9BF093BC475BABF8B6AEA5F6D7C3F131AB2A91F5; + 70BC7F9D8C60D2265B7076A23760DBCFFD6645AB; + }; + }; +}; + Generate-Index-Diffs { Options { - TempDir "/org/ftp.debian.org/tiffani"; - MaxDiffs { Default 90; }; + TempDir "/srv/ftp.debian.org/tiffani"; + MaxDiffs { Default 14; }; }; }; @@ -50,9 +74,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 { @@ -66,7 +90,7 @@ Import-Users-From-Passwd { ValidGID "800"; // Comma separated list of users who are in Postgres but not the passwd file - KnownPostgres "postgres,dak"; + KnownPostgres "postgres,dak,katie"; }; Clean-Queues @@ -98,19 +122,19 @@ 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 { StableRejector "Andreas Barth and Martin Zobel-Helas"; - MoreInfoURL "http://release.debian.org/stable/3.1/3.1r2/"; + MoreInfoURL "http://release.debian.org/stable/3.1/3.1r5/"; }; Import-LDAP-Fingerprints @@ -119,9 +143,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"; }; @@ -136,7 +160,7 @@ Clean-Suites Process-New { - AcceptedLockFile "/org/ftp.debian.org/lock/unchecked.lock"; + AcceptedLockFile "/srv/ftp.debian.org/lock/unchecked.lock"; }; Check-Overrides @@ -222,9 +246,9 @@ Suite sparc; }; Announce "debian-changes@lists.debian.org"; - Version "3.1r2"; + Version "3.1r5"; Origin "Debian"; - Description "Debian 3.1r2 Released 17 April 2006"; + Description "Debian 3.1r5 Released 17 February 2007"; CodeName "sarge"; OverrideCodeName "sarge"; Priority "3"; @@ -262,7 +286,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"; @@ -327,6 +351,7 @@ Suite UdebComponents { main; + non-free; }; }; @@ -383,6 +408,7 @@ Suite UdebComponents { main; + non-free; }; }; @@ -431,6 +457,7 @@ Suite UdebComponents { main; + non-free; }; }; @@ -479,7 +506,11 @@ Suite Unstable; }; }; - + UdebComponents + { + main; + non-free; + }; }; }; @@ -500,29 +531,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/"; }; }; @@ -655,7 +686,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";