From 15a4da25cda1e33ccc1d951dc21f24380c6a2239 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 29 Aug 2009 14:46:02 +0200 Subject: [PATCH] Add debian-maintainers.gpg to keyrings and sync_keyrings. --- debian/changelog | 4 +++- userdir-ldap.conf | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9770005..002573d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ userdir-ldap (0.3.72XX) Xnstable; urgency=low * ud-useradd: Allow unsetting of middle names by entering a space. + * userdir-ldap.conf: Add debian-maintainers.gpg to keyrings and + sync_keyrings. - -- Peter Palfrader Tue, 25 Aug 2009 12:01:33 +0200 + -- Peter Palfrader Sat, 29 Aug 2009 14:45:29 +0200 userdir-ldap (0.3.71) unstable; urgency=low diff --git a/userdir-ldap.conf b/userdir-ldap.conf index e01b60f..cb4a5cb 100644 --- a/userdir-ldap.conf +++ b/userdir-ldap.conf @@ -46,9 +46,9 @@ 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" +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 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" +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" # 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:/srv/db.debian.org/keyring-guest/guest-keyring/debian-guest.gpg" -- 2.20.1