ud-generate: move the regex that determines whether or not to include a host in the...

diff --git a/debian/changelog b/debian/changelog
index d08eb5a..14122ce 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,11 @@ userdir-ldap (0.3.76xXx) unstable; urgency=low
     email headers
   * ud-useradd: Properly encode realname in subjects and to header lines
     regardless of which template is being used.
+  * ud-generate: move the regex that determines whether or not to include
+    a host in the dns-sshfp zone snippet (for SSHFP and A, AAAA and MX
+    records) to the config file.
 
- -- Peter Palfrader <weasel@debian.org>  Sat, 09 Jan 2010 11:58:30 +0100
+ -- Peter Palfrader <weasel@debian.org>  Sat, 09 Jan 2010 16:50:24 +0100
 
 userdir-ldap (0.3.75) unstable; urgency=low
 

diff --git a/ud-generate b/ud-generate
index 4514bde..881f521 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -48,7 +48,7 @@ EmailCheck = re.compile("^([^ <>@]+@[^ ,<>@]+)?$")
 BSMTPCheck = re.compile(".*mx 0 (master)\.debian\.org\..*",re.DOTALL)
 PurposeHostField = re.compile(r".*\[\[([\*\-]?[a-z0-9.\-]*)(?:\|.*)?\]\]")
 IsV6Addr = re.compile("^[a-fA-F0-9:]+$")
-IsDebianHost = re.compile("[a-zA-Z0-9\.]+\.debian\.org$")
+IsDebianHost = re.compile(ConfModule.dns_hostmatch)
 DNSZone = ".debian.net"
 Keyrings = ConfModule.sync_keyrings.split(":")
 

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 78a2fee..64423d8 100644 (file)
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -80,3 +80,6 @@ countrylist = "/var/www/userdir-ldap/domains.tab";
 
 # Finger daemon settings
 # use_inetd = 1;
+
+# only create sshfp and A records for hostnames matching this:
+dns_hostmatch = "[a-zA-Z0-9\.]+\.debian\.org$"