X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fdak.conf;h=36e1a58ecdc05c7081d05ca24fcaf70f1598bd81;hb=7ba4ac6dfc9ec4473e99b814a35add978cc00264;hp=d97c52bacfe385fb1862ed9866efe5b01da9055a;hpb=0e72a3ee12f53a7a3a0348738389df2e59b35bd9;p=dak.git diff --git a/config/backports/dak.conf b/config/backports/dak.conf index d97c52ba..36e1a58e 100644 --- a/config/backports/dak.conf +++ b/config/backports/dak.conf @@ -1,10 +1,5 @@ Dinstall { - // Both need to be defined at the moment, but they can point to the - // same file. - GPGKeyring { - "/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 "/srv/backports-master.debian.org/s3kr1t/dot-gnupg/secring.gpg"; @@ -34,11 +29,7 @@ Dinstall CloseBugs "false"; OverrideDisparityCheck "false"; DefaultSuite "lenny-backports"; - Reject - { - NoSourceOnly "true"; - ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml"; - }; + ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml"; // If set, only send mails to addresses listed there. // format of entries: one entry per line. Either an email address directly, or a regular expression, // prefixed by "RE:". Examples: "jane.doe@domain.com" or "RE:jane[^@]@domain.com", where the first will @@ -111,7 +102,7 @@ Import-Users-From-Passwd // The Primary GID of your users. Using uma it is the gid from group users. ValidGID "800"; // Comma separated list of users who are in Postgres but not the passwd file - KnownPostgres "postgres,katie,dak,www-data,qa,guest"; + KnownPostgres "postgres,katie,dak,www-data,qa,guest,repuser"; }; Queue-Report @@ -139,8 +130,6 @@ Control-Overrides Suite "lenny-backports"; Type "deb"; }; - - ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name }; Rm @@ -213,26 +202,24 @@ Dir Pool "/srv/backports-master.debian.org/ftp/pool/"; Export "/srv/backports-master.debian.org/export/"; Templates "/srv/backports-master.debian.org/dak/templates/"; - PoolRoot "pool/"; Lists "/srv/backports-master.debian.org/database/dists/"; Cache "/srv/backports-master.debian.org/database/"; Log "/srv/backports-master.debian.org/log/"; Lock "/srv/backports-master.debian.org/lock"; Morgue "/srv/backports-master.debian.org/morgue/"; - MorgueReject "reject"; Override "/srv/backports-master.debian.org/scripts/override/"; - QueueBuild "/srv/backports-master.debian.org/buildd/"; UrgencyLog "/srv/backports-master.debian.org/testing/urgencies/"; TempPath "/srv/backports-master.debian.org/tmp"; + BTSVersionTrack "/srv/backports-master.debian.org/queue/bts_version_track/"; + Holding "/srv/backports-master.debian.org/queue/holding/"; + Done "/srv/backports-master.debian.org/queue/done/"; + Queue { 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/"; 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/"; Newstage "/srv/backports-master.debian.org/queue/newstage/"; Embargoed "/srv/backports-master.debian.org/queue/Embargoed/"; Unembargoed "/srv/backports-master.debian.org/queue/Unembargoed/"; @@ -294,28 +281,6 @@ Archive }; }; -Component -{ - main - { - Description "Main"; - MeetsDFSG "true"; - }; - - contrib - { - Description "Contrib"; - MeetsDFSG "true"; - }; - - non-free - { - Description "Software that fails to meet the DFSG"; - MeetsDFSG "false"; - }; - -}; - Section { admin; @@ -382,24 +347,6 @@ Priority source 0; // i.e. unused }; -OverrideType -{ - deb; - udeb; - dsc; -}; - -Location -{ - // Pool locations on backports.debian.org - /srv/backports-master.debian.org/ftp/pool/ - { - Archive "backports"; - Type "pool"; - }; - -}; - Urgency { Default "low";