From 9395775f2c5f320feb64a27811db0c0945c9c5c9 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 19 Sep 2010 01:44:42 +0200 Subject: [PATCH] Remove .pgp (v3 pgp key) keyrings from config --- debian/changelog | 3 ++- userdir-ldap.conf | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 217e57f..971fb7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ userdir-ldap (0.3.7X) Xnstable; urgency=low * ud-useradd: A new -g switch for adding guest accounts, with proper setting hostacls and shadowexpire and picking the right keyring. + * Remove .pgp (v3 pgp key) keyrings from config. - -- Peter Palfrader Sun, 19 Sep 2010 01:42:10 +0200 + -- Peter Palfrader Sun, 19 Sep 2010 01:44:24 +0200 userdir-ldap (0.3.78) unstable; urgency=low diff --git a/userdir-ldap.conf b/userdir-ldap.conf index 108b38c..3c45fe3 100644 --- a/userdir-ldap.conf +++ b/userdir-ldap.conf @@ -49,11 +49,11 @@ homeprefix = "/home/"; # GPG Things gpg = "/usr/bin/gpg"; # The whole set of all keyrings -keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/removed-keys.gpg:/org/keyring.debian.org/keyrings/removed-keys.pgp:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg:/org/keyring.debian.org/keyrings/debian-maintainers.gpg" +keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/removed-keys.gpg:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg:/org/keyring.debian.org/keyrings/debian-maintainers.gpg" # Keyrings synced to other machines, if they need them -sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp:/org/keyring.debian.org/keyrings/debian-maintainers.gpg" +sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-maintainers.gpg" # Keyrings used to search in when new developers get added -add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp" +add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg" add_keyrings_guest = "/org/keyring.debian.org/keyrings/debian-maintainers.gpg:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg" # For the WEB interface -- 2.20.1