From 54432ce1af06ed844ee9ca02dd1e059daada6427 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sun, 18 May 2008 13:45:59 +0200 Subject: [PATCH] Make ud-useradd also not use hardcoded path --- debian/changelog | 4 +++- ud-useradd | 2 +- userdir-ldap.conf | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 23693bc..ac00d77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,9 @@ userdir-ldap (0.3.25+common1) unstable; urgency=low * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP) [ Joerg Jaspert ] - * User sync_keyrings from config file in ud-generate instead of a + * Use sync_keyrings from config file in ud-generate instead of a + hardcoded list + * Use add_keyrings from config file in ud-useradd instead of a hardcoded list -- Joerg Jaspert Sun, 18 May 2008 13:32:01 +0200 diff --git a/ud-useradd b/ud-useradd index 494c348..f5c1fbc 100755 --- a/ud-useradd +++ b/ud-useradd @@ -70,7 +70,7 @@ for (switch, val) in options: l = passwdAccessLDAP(LDAPServer, BaseDn, AdminUser) # Locate the key of the user we are adding -SetKeyrings(["/org/keyring.debian.org/keyrings/debian-keyring.gpg"]) +SetKeyrings(ConfModule.add_keyrings.split(":")) while (1): Foo = raw_input("Who are you going to add (for a GPG search)? "); if Foo == "": diff --git a/userdir-ldap.conf b/userdir-ldap.conf index d54ddc7..090ac5a 100644 --- a/userdir-ldap.conf +++ b/userdir-ldap.conf @@ -42,8 +42,12 @@ passdir = "/etc/userdir-ldap/"; # 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:/home/jgg/keys/extrakeys.gpg:/home/jgg/keys/guest-keys.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"; +# Keyrings used to search in when new developers get added +add_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg"; # For the WEB interface webloginhtml = "login.html"; -- 2.20.1