[Da-tools-commits] ./da-tools/userdir-ldap-common r398: Use sync_keyrings from config instead of hardcoded list

[Joerg Jaspert]

------------------------------------------------------------
revno: 398
committer: Joerg Jaspert <joerg at debian.org>
branch nick: userdir-ldap-common
timestamp: Sun 2008-05-18 13:32:27 +0200
message:
  Use sync_keyrings from config instead of hardcoded list
modified:
  debian/changelog
  ud-generate
  userdir-ldap.conf
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-18 11:26:17 +0000
+++ b/debian/changelog	2008-05-18 11:32:27 +0000
@@ -6,7 +6,11 @@
   [ Andreas Barth ]
   * Disable GSSAPIAuthentication in ud-replicate (safes time)
 
- -- Andreas Barth <aba at ayous.org>  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 <joerg at debian.org>  Sun, 18 May 2008 13:32:01 +0200
 
 userdir-ldap (0.3.25) unstable; urgency=low
 

=== modified file 'ud-generate'
--- a/ud-generate	2008-05-17 14:15:26 +0000
+++ b/ud-generate	2008-05-18 11:32:27 +0000
@@ -38,8 +38,7 @@
 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:

=== modified file 'userdir-ldap.conf'
--- a/userdir-ldap.conf	2008-05-14 18:55:18 +0000
+++ b/userdir-ldap.conf	2008-05-18 11:32:27 +0000
@@ -43,6 +43,7 @@
 # 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";