ud-generate: get RTC domain/realm from config file

diff --git a/debian/changelog b/debian/changelog
index bbda98b..061c7bd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,11 +8,12 @@ userdir-ldap (0.3.87) UNRELEASED; urgency=medium
   * ud-guest-extend: add
   * ud-replicate: only install/reload RTC files when they have changed.
   * ud-replicate: use persistent ssh connections.
+  * ud-generate: get RTC domain/realm from config file.
 
   [ Paul Wise ]
   * Update ud-ldapshow and cleanup cruft around the usergroups changes
 
- -- Peter Palfrader <weasel@debian.org>  Thu, 19 Nov 2015 09:52:43 +0100
+ -- Peter Palfrader <weasel@debian.org>  Fri, 05 Feb 2016 19:15:21 +0100
 
 userdir-ldap (0.3.86) unstable; urgency=medium
 

diff --git a/ud-generate b/ud-generate
index 7b9ca4c..68ed646 100755 (executable)
--- a/ud-generate
+++ b/ud-generate
@@ -78,6 +78,9 @@ GitoliteSSHCommand = getattr(ConfModule, "gitolitesshcommand", None)
 GitoliteExportHosts = re.compile(getattr(ConfModule, "gitoliteexporthosts", "."))
 MX_remap = json.loads(ConfModule.MX_remap)
 
+rtc_realm = getattr(ConfModule, "rtc_realm", None)
+rtc_append = getattr(ConfModule, "rtc_append", None)
+
 def prettify(elem):
    """Return a pretty-printed XML string for the Element.
    """
@@ -436,7 +439,7 @@ def GenRtcPassword(accounts, File):
          if not 'rtcPassword' in a: continue
          if not a.pw_active(): continue
 
-         Line = "%s@debian.org:%s:rtc.debian.org:AUTHORIZED" % (a['uid'], str(a['rtcPassword']))
+         Line = "%s%s:%s:%s:AUTHORIZED" % (a['uid'], rtc_append, str(a['rtcPassword']), rtc_realm)
          Line = Sanitize(Line) + "\n"
          F.write("%s" % (Line))
 

diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 7d2643b..0cdcdf3 100644 (file)
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -20,6 +20,9 @@ adminuser = "admin";
 # Printable email addresses are shown as: 'cn mn sn <uid@emailappend>'
 emailappend = "debian.org";
 
+rtc_realm = "rtc.debian.org";
+rtc_append = "@debian.org";
+
 # Domain for hosts, defaults to emailappend if not present
 #hostdomain = "debian.org"