Dinstall
{
- PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
- GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
- SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
- SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
- SigningKeyIds "4F368D5D";
+ GPGKeyring {
+ "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
+ };
+ // was non-us.d.o path before
+ SigningKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
+ SigningPubKeyring "/srv/security-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
+ SigningKeyIds "55BE302B";
SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
MyAdminAddress "ftpmaster@debian.org";
MyDistribution "Debian"; // Used in emails
BugServer "bugs.debian.org";
PackagesServer "packages.debian.org";
- LockFile "/org/security.debian.org/katie/lock";
+ LockFile "/org/security-master.debian.org/dak/lock";
Bcc "archive@ftp-master.debian.org";
// GroupOverrideFilename "override.group-maint";
FutureTimeTravelGrace 28800; // 8 hours
BXANotify "false";
QueueBuildSuites
{
- oldstable;
stable;
testing;
};
SecurityQueueHandling "true";
SecurityQueueBuild "true";
- DefaultSuite "Testing";
+ DefaultSuite "stable";
SuiteSuffix "updates";
- OverrideMaintainer "katie@security.debian.org";
- StableDislocationSupport "false";
+ OverrideMaintainer "dak@security.debian.org";
LegacyStableHasNoSections "false";
};
-Julia
+Process-New
+{
+ AcceptedLockFile "/srv/security-master.debian.org/lock/unchecked.lock";
+ LockDir "/srv/security-master.debian.org/lock/new/";
+};
+
+Import-Users-From-Passwd
{
ValidGID "800";
// Comma separated list of users who are in Postgres but not the passwd file
- KnownPostgres "postgres,katie,www-data,udmsearch";
+ KnownPostgres "postgres,dak,www-data,udmsearch";
};
-Helena
+Queue-Report
{
Directories
{
- byhand;
- new;
- accepted;
+ // byhand;
+ // new;
+ unembargoed;
+ };
+};
+
+Import-Keyring
+{
+ /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
+ {
+ Debian-Maintainer "true";
+ };
+};
+
+Import-LDAP-Fingerprints
+{
+ LDAPDn "ou=users,dc=debian,dc=org";
+ LDAPServer "db.debian.org";
+ ExtraKeyrings
+ {
+ "/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";
+};
+
+Check-Overrides
+{
+ OverrideSuites
+ {
+ Stable
+ {
+ Process "0";
+ };
+
+ Testing
+ {
+ Process "0";
+ };
+
};
};
-Shania
+Clean-Queues
{
Options
{
Days 14;
};
- MorgueSubDir "shania";
+ MorgueSubDir "queue";
};
-Melanie
+Rm
{
Options
{
};
MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
- LogFile "/org/security.debian.org/katie-log/removals.txt";
+ LogFile "/srv/security-master.debian.org/dak-log/removals.txt";
};
-Neve
+Init-Archive
{
- ExportDir "/org/security.debian.org/katie/neve-files/";
+ ExportDir "/srv/security-master.debian.org/dak/import-archive-files/";
};
-Rhona
+Clean-Suites
{
// How long (in seconds) dead packages are left before being killed
StayOfExecution 129600; // 1.5 days
QueueBuildStayOfExecution 86400; // 24 hours
- MorgueSubDir "rhona";
+ MorgueSubDir "pool";
OverrideFilename "override.source-only";
};
-Amber
+Security-Install
{
ComponentMappings
{
Suite
{
// Priority determines which suite is used for the Maintainers file
- // as generated by charisma (highest wins).
-
- Oldstable
- {
- Components
- {
- updates/main;
- updates/contrib;
- updates/non-free;
- };
- Architectures
- {
- source;
- all;
- alpha;
- arm;
- hppa;
- i386;
- ia64;
- m68k;
- mips;
- mipsel;
- powerpc;
- s390;
- sparc;
- };
- Announce "katie@security.debian.org";
- Version "3.0";
- Origin "Debian";
- Label "Debian-Security";
- Description "Debian 3.0 Security Updates";
- CodeName "woody";
- OverrideCodeName "woody";
- CopyKatie "/org/security.debian.org/queue/done/";
- };
+ // as generated by 'dak make-maintainers' (highest wins).
Stable
{
updates/contrib;
updates/non-free;
};
- Architectures
- {
- source;
- all;
- alpha;
- amd64;
- arm;
- hppa;
- i386;
- ia64;
- m68k;
- mips;
- mipsel;
- powerpc;
- s390;
- sparc;
- };
- Announce "katie@security.debian.org";
- Version "3.1";
+ Announce "dak@security.debian.org";
+ Version "";
Origin "Debian";
Label "Debian-Security";
- Description "Debian 3.1 Security Updates";
- CodeName "sarge";
- OverrideCodeName "sarge";
- CopyKatie "/org/security.debian.org/queue/done/";
+ Description "Debian 5.0 Security Updates";
+ ValidTime 864000; // 10 days
+ CodeName "lenny";
+ OverrideCodeName "lenny";
+ CopyDotDak "/srv/security-master.debian.org/queue/done/";
};
Testing
{
- Components
+ Components
{
updates/main;
updates/contrib;
updates/non-free;
};
- Architectures
- {
- source;
- all;
- amd64;
- alpha;
- arm;
- hppa;
- i386;
- ia64;
- m68k;
- mips;
- mipsel;
- powerpc;
- s390;
- sparc;
- };
- Announce "katie@security.debian.org";
- Version "x.y";
+ Announce "dak@security.debian.org";
+ Version "";
Origin "Debian";
Label "Debian-Security";
- Description "Debian x.y Security Updates";
- CodeName "etch";
- OverrideCodeName "etch";
- CopyKatie "/org/security.debian.org/queue/done/";
+ Description "Debian testing Security Updates";
+ ValidTime 864000; // 10 days
+ CodeName "squeeze";
+ OverrideCodeName "squeeze";
+ CopyDotDak "/srv/security-master.debian.org/queue/done/";
};
-
};
SuiteMappings
{
- "silent-map oldstable-security oldstable";
"silent-map stable-security stable";
+ "silent-map oldstable-security oldstable";
// JT - FIXME, hackorama
// "silent-map testing-security stable";
+ "silent-map etch-secure oldstable";
+ "silent-map lenny-secure stable";
"silent-map testing-security testing";
};
Dir
{
- Root "/org/security.debian.org/ftp/";
- Pool "/org/security.debian.org/ftp/pool/";
- Katie "/org/security.debian.org/katie/";
- Templates "/org/security.debian.org/katie/templates/";
+ Root "/srv/security-master.debian.org/ftp/";
+ Pool "/srv/security-master.debian.org/ftp/pool/";
+ Dak "/srv/security-master.debian.org/dak/";
+ Templates "/srv/security-master.debian.org/dak/templates/";
PoolRoot "pool/";
- Override "/org/security.debian.org/override/";
- Lock "/org/security.debian.org/lock/";
- Lists "/org/security.debian.org/katie-database/dists/";
- Log "/org/security.debian.org/katie-log/";
- Morgue "/org/security.debian.org/morgue/";
+ Override "/srv/security-master.debian.org/override/";
+ Lock "/srv/security-master.debian.org/lock/";
+ Cache "/srv/security-master.debian.org/database/";
+ Lists "/srv/security-master.debian.org/dak-database/dists/";
+ Log "/srv/security-master.debian.org/dak-log/";
+ Morgue "/srv/security-master.debian.org/morgue/";
MorgueReject "reject";
- Override "/org/security.debian.org/scripts/override/";
- QueueBuild "/org/security.debian.org/buildd/";
+ Override "/srv/security-master.debian.org/scripts/override/";
+ QueueBuild "/srv/security-master.debian.org/buildd/";
+ Upload "/srv/queued/ftpmaster/";
Queue
{
- Accepted "/org/security.debian.org/queue/accepted/";
- Byhand "/org/security.debian.org/queue/byhand/";
- Done "/org/security.debian.org/queue/done/";
- Holding "/org/security.debian.org/queue/holding/";
- New "/org/security.debian.org/queue/new/";
- Reject "/org/security.debian.org/queue/reject/";
- Unchecked "/org/security.debian.org/queue/unchecked/";
-
- Embargoed "/org/security.debian.org/queue/embargoed/";
- Unembargoed "/org/security.debian.org/queue/unembargoed/";
- Disembargo "/org/security.debian.org/queue/unchecked-disembargo/";
+ Byhand "/srv/security-master.debian.org/queue/byhand/";
+ Done "/srv/security-master.debian.org/queue/done/";
+ Holding "/srv/security-master.debian.org/queue/holding/";
+ New "/srv/security-master.debian.org/queue/new/";
+ Reject "/srv/security-master.debian.org/queue/reject/";
+ Unchecked "/srv/security-master.debian.org/queue/unchecked/";
+ Newstage "/srv/security-master.debian.org/queue/newstage/";
+
+ ProposedUpdates "/does/not/exist/"; // XXX fixme
+ OldProposedUpdates "/does/not/exist/"; // XXX fixme
+
+ Embargoed "/srv/security-master.debian.org/queue/embargoed/";
+ Unembargoed "/srv/security-master.debian.org/queue/unembargoed/";
+ Disembargo "/srv/security-master.debian.org/queue/unchecked-disembargo/";
};
};
alpha "DEC Alpha";
hppa "HP PA RISC";
arm "ARM";
+ armel "ARM EABI";
i386 "Intel ia32";
ia64 "Intel ia64";
- m68k "Motorola Mc680x0";
mips "MIPS (Big Endian)";
mipsel "MIPS (Little Endian)";
powerpc "PowerPC";
s390 "IBM S/390";
sparc "Sun SPARC/UltraSPARC";
amd64 "AMD x86_64 (AMD64)";
+ kfreebsd-i386 "GNU/kFreeBSD i386";
+ kfreebsd-amd64 "GNU/kFreeBSD amd64";
};
Section
{
admin;
- base;
+ cli-mono;
comm;
+ database;
debian-installer;
+ debug;
devel;
doc;
editors;
- electronics;
embedded;
+ electronics;
+ fonts;
games;
gnome;
graphics;
+ gnu-r;
+ gnustep;
hamradio;
+ haskell;
+ httpd;
interpreters;
+ java;
kde;
+ kernel;
libdevel;
libs;
+ lisp;
+ localization;
mail;
math;
misc;
net;
news;
+ ocaml;
oldlibs;
otherosfs;
perl;
+ php;
python;
+ ruby;
science;
shells;
sound;
text;
utils;
web;
+ vcs;
+ video;
x11;
- non-US;
+ xfce;
+ zope;
};
Priority
Location
{
- /org/security.debian.org/ftp/dists/
- {
- Archive "security";
- Type "legacy";
- };
-
- /org/security.debian.org/ftp/pool/
+ /srv/security-master.debian.org/ftp/pool/
{
Archive "security";
Suites
{
- Oldstable;
+ OldStable;
Stable;
Testing;
};
projects / dak.git / blobdiff