From faa36ce1922a827f9ce57f59d93812e37b31cb00 Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Sun, 18 May 2008 13:32:27 +0200 Subject: [PATCH] Use sync_keyrings from config instead of hardcoded list --- debian/changelog | 6 +++++- ud-generate | 3 +-- userdir-ldap.conf | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ea940a4..6c12898 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,7 +6,11 @@ userdir-ldap (0.3.25+common1) unstable; urgency=low [ Andreas Barth ] * Disable GSSAPIAuthentication in ud-replicate (safes time) - -- Andreas Barth Sun, 18 May 2008 11:25:31 +0000 + [ Joerg Jaspert ] + * User sync_keyrings from config file in ud-generate instead of a + hardcoded list + + -- Joerg Jaspert Sun, 18 May 2008 13:32:01 +0200 userdir-ldap (0.3.25) unstable; urgency=low diff --git a/ud-generate b/ud-generate index 6103fa8..10a124d 100755 --- a/ud-generate +++ b/ud-generate @@ -38,8 +38,7 @@ CurrentHost = ""; EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$"); BSMTPCheck = re.compile(".*mx 0 (gluck)\.debian\.org\..*",re.DOTALL); DNSZone = ".debian.net" -Keyrings = [ "/org/keyring.debian.org/keyrings/debian-keyring.gpg", - "/org/keyring.debian.org/keyrings/debian-keyring.pgp" ] +Keyrings = ConfModule.sync_keyrings.split(":") def safe_makedirs(dir): try: diff --git a/userdir-ldap.conf b/userdir-ldap.conf index 98a4c28..d54ddc7 100644 --- a/userdir-ldap.conf +++ b/userdir-ldap.conf @@ -43,6 +43,7 @@ passdir = "/etc/userdir-ldap/"; # GPG Things gpg = "/usr/bin/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:/home/jgg/keys/extrakeys.gpg:/home/jgg/keys/guest-keys.gpg"; +sync_keyrings = "/org/keyring.debian.org/keyrings/debian-keyring.gpg:/org/keyring.debian.org/keyrings/debian-keyring.pgp"; # For the WEB interface webloginhtml = "login.html"; -- 2.20.1