[dak/franck] No more pgp keyring
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
config/debian-security/dak.conf | 1 -
config/debian/dak.conf | 1 -
dak/dakdb/update18.py | 1 -
dak/import_known_changes.py | 1 -
tools/debianqueued-0.9/config | 1 -
tools/debianqueued-0.9/config-security | 3 +--
tools/debianqueued-0.9/config-upload | 1 -
7 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index cbaebce..151f006 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 7c76d0c..2610da3 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 c3ace63..ce0086f 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 da696ae..b3f8e8a 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 1fe0b0e..0c608ce 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 2f0d867..57a8f3a 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 f803393..a8743e5 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
--
1.5.6.5
Reply to: