X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=6b5e17a9db52dc157b4f063d76b55333775e3099;hb=61eb4e708c28e6ee5ffa8b7fbbd6c3e0ad4887fc;hp=a9eb3fb4271e64f943e23509980b7307bc9b3270;hpb=93746045d5a3a4943e1e464c77880a7070a31aba;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index a9eb3fb4..6b5e17a9 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,9 +1,5 @@
 Dinstall
 {
-   GPGKeyring {
-      "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-      "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
-   };
    SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
 //   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
@@ -27,7 +23,6 @@ Dinstall
    LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags";
    Reject
    {
-     NoSourceOnly "true";
      ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
    };
    // if you setup an own dak repository and want to upload Debian packages you most possibly want
@@ -69,7 +64,7 @@ Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest";
+  KnownPostgres "postgres,dak,katie,release,qa,www-data,guest,repuser";
 };
 
 Clean-Queues
@@ -89,8 +84,6 @@ Control-Overrides
     Suite "unstable";
     Type "deb";
    };
-
- ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
 };
 
 Rm
@@ -196,17 +189,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	  };
-	  Enhances
-          {
-	    OldStable;
-	  };
-	};
   };
 
   Proposed-Updates
@@ -217,24 +199,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	    Stable;
-	  };
-//	  MustBeOlderThan
-//	  {
-//	    Testing;
-//	    Unstable;
-//	    Experimental;
-//	  };
-	  Enhances
-          {
-	    Stable;
-	  };
-	};
   };
 
   Testing
@@ -255,25 +219,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	    Stable;
-//	    Proposed-Updates;
-	    Testing;
-	  };
-	  MustBeOlderThan
-	  {
-	    Unstable;
-	    Experimental;
-	  };
-	  Enhances
-          {
-	    Testing;
-          };
-	};
   };
 
   Squeeze-Updates
@@ -284,25 +229,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    Stable;
-	  };
-      MustBeOlderThan
-      {
-        Testing;
-        Testing-Proposed-Updates;
-        Unstable;
-        Experimental;
-      };
-	  Enhances
-      {
-	    Stable;
-	  };
-	};
-
   };
 
   Unstable
@@ -313,17 +239,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	    Stable;
-//	    Proposed-Updates;
-	    Testing;
-	    Testing-Proposed-Updates;
-	  };
-	};
   };
 
   Experimental
@@ -334,20 +249,7 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	VersionChecks
-	{
-	  MustBeNewerThan
-	  {
-	    OldStable;
-	    Stable;
-//	    Proposed-Updates;
-	    Testing;
-	    Testing-Proposed-Updates;
-	    Unstable;
-	  };
-	};
   };
-
 };
 
 SuiteMappings
@@ -359,8 +261,12 @@ SuiteMappings
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
  "map lenny oldstable";
+ "map lenny-proposed-updates oldstable-proposed-updates";
  "map squeeze stable";
+ "map squeeze-proposed-updates proposed-updates";
+ "map squeeze-updates proposed-updates";
  "map wheezy testing";
+ "map wheezy-proposed-updates testing-proposed-updates";
  "map sid unstable";
  "map rc-buggy experimental";
  "map oldstable oldstable-proposed-updates";
@@ -368,6 +274,7 @@ SuiteMappings
  "map stable proposed-updates";
  "map stable-security proposed-updates";
  "map stable-proposed-updates proposed-updates";
+ "map stable-updates proposed-updates";
  "map-unreleased oldstable unstable";
  "map-unreleased stable unstable";
  "map-unreleased proposed-updates unstable";
@@ -418,7 +325,6 @@ Dir
   Log "/srv/ftp-master.debian.org/log/";
   Lock "/srv/ftp-master.debian.org/lock";
   Morgue "/srv/ftp-master.debian.org/morgue/";
-  MorgueReject "reject";
   Override "/srv/ftp-master.debian.org/scripts/override/";
   UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
   TempPath "/srv/ftp-master.debian.org/tmp/";
@@ -453,7 +359,7 @@ DB
 {
   Service "projectb";
   // PoolSize should be at least ThreadCount + 1
-  PoolSize 17;
+  PoolSize 5;
   // MaxOverflow shouldn't exceed postgresql.conf's max_connections - PoolSize
   MaxOverflow 13;
   // should be false for encoding == SQL_ASCII
@@ -470,34 +376,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";
-  };
-};
-
-OverrideType
-{
-  deb;
-  udeb;
-  dsc;
-};
-
 Urgency
 {
   Default "low";