From: Joerg Jaspert <joerg@debian.org>
Date: Thu, 1 Jul 2010 20:42:42 +0000 (+0200)
Subject: No more pgp keyring
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=6d348a7d645a80032bbdb26aafcce0ac687ecd26;p=dak.git

No more pgp keyring

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index cbaebce4..151f006a 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -2,7 +2,6 @@ Dinstall
 {
    GPGKeyring {
      "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
-     "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
    };
    SigningKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/org/non-us.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7c76d0ca..2610da38 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -2,7 +2,6 @@ Dinstall
 {
    GPGKeyring {
       "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-      "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
       "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
    };
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
diff --git a/dak/dakdb/update18.py b/dak/dakdb/update18.py
index c3ace63d..ce0086f6 100755
--- a/dak/dakdb/update18.py
+++ b/dak/dakdb/update18.py
@@ -42,7 +42,6 @@ from daklib.utils import parse_changes, warn, gpgv_get_status_output, process_gp
 def check_signature (sig_filename, data_filename=""):
     keyrings = [
         "/home/joerg/keyring/keyrings/debian-keyring.gpg",
-        "/home/joerg/keyring/keyrings/debian-keyring.pgp",
         "/home/joerg/keyring/keyrings/debian-maintainers.gpg",
         "/home/joerg/keyring/keyrings/debian-role-keys.gpg",
         "/home/joerg/keyring/keyrings/emeritus-keyring.pgp",
diff --git a/dak/import_known_changes.py b/dak/import_known_changes.py
index da696aed..b3f8e8a8 100755
--- a/dak/import_known_changes.py
+++ b/dak/import_known_changes.py
@@ -70,7 +70,6 @@ def check_signature (sig_filename, data_filename=""):
 
     keyrings = [
         "/home/joerg/keyring/keyrings/debian-keyring.gpg",
-        "/home/joerg/keyring/keyrings/debian-keyring.pgp",
         "/home/joerg/keyring/keyrings/debian-maintainers.gpg",
         "/home/joerg/keyring/keyrings/debian-role-keys.gpg",
         "/home/joerg/keyring/keyrings/emeritus-keyring.pgp",
diff --git a/tools/debianqueued-0.9/config b/tools/debianqueued-0.9/config
index 1fe0b0e3..0c608cea 100644
--- a/tools/debianqueued-0.9/config
+++ b/tools/debianqueued-0.9/config
@@ -64,7 +64,6 @@ $statusdelay = 30;
 
 # names of the keyring files
 @keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg",
-              "/srv/keyring.debian.org/keyrings/debian-keyring.pgp",
               "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg" );
 
 # our log file
diff --git a/tools/debianqueued-0.9/config-security b/tools/debianqueued-0.9/config-security
index 2f0d8673..57a8f3a3 100644
--- a/tools/debianqueued-0.9/config-security
+++ b/tools/debianqueued-0.9/config-security
@@ -63,8 +63,7 @@ $statusfile = "$incoming/status";
 $statusdelay = 30;
 
 # names of the keyring files
-@keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg",
-              "/srv/keyring.debian.org/keyrings/debian-keyring.pgp");
+@keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg" );
 
 # our log file
 $logfile = "$queued_dir/log";
diff --git a/tools/debianqueued-0.9/config-upload b/tools/debianqueued-0.9/config-upload
index f8033936..a8743e53 100644
--- a/tools/debianqueued-0.9/config-upload
+++ b/tools/debianqueued-0.9/config-upload
@@ -64,7 +64,6 @@ $statusdelay = 30;
 
 # names of the keyring files
 @keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg",
-              "/srv/keyring.debian.org/keyrings/debian-keyring.pgp",
               "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg" );
 
 # our log file