projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace RSA authentication with public-key authentication in welcome messages.
[mirror/userdir-ldap.git]
/
ud-generate
diff --git
a/ud-generate
b/ud-generate
index
7b9ca4c
..
3dac331
100755
(executable)
--- a/
ud-generate
+++ b/
ud-generate
@@
-77,6
+77,10
@@
GitoliteSSHRestrictions = getattr(ConfModule, "gitolitesshrestrictions", None)
GitoliteSSHCommand = getattr(ConfModule, "gitolitesshcommand", None)
GitoliteExportHosts = re.compile(getattr(ConfModule, "gitoliteexporthosts", "."))
MX_remap = json.loads(ConfModule.MX_remap)
GitoliteSSHCommand = getattr(ConfModule, "gitolitesshcommand", None)
GitoliteExportHosts = re.compile(getattr(ConfModule, "gitoliteexporthosts", "."))
MX_remap = json.loads(ConfModule.MX_remap)
+use_mq = getattr(ConfModule, "use_mq", True)
+
+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.
def prettify(elem):
"""Return a pretty-printed XML string for the Element.
@@
-433,10
+437,11
@@
def GenRtcPassword(accounts, File):
os.umask(OldMask)
for a in accounts:
os.umask(OldMask)
for a in accounts:
+ if a.is_guest_account(): continue
if not 'rtcPassword' in a: continue
if not a.pw_active(): continue
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))
Line = Sanitize(Line) + "\n"
F.write("%s" % (Line))
@@
-897,7
+902,7
@@
def ExtractDNSInfo(x):
Mach = ""
if x[1].has_key("machine"):
Mach = " " + GetAttr(x, "machine")
Mach = ""
if x[1].has_key("machine"):
Mach = " " + GetAttr(x, "machine")
- DNSInfo.append("%sIN\tHINFO\t\"%s%s\" \"%s\"" % (TTLprefix, Arch, Mach, "Debian
GNU/Linux
"))
+ DNSInfo.append("%sIN\tHINFO\t\"%s%s\" \"%s\"" % (TTLprefix, Arch, Mach, "Debian"))
if x[1].has_key("mXRecord"):
for I in x[1]["mXRecord"]:
if x[1].has_key("mXRecord"):
for I in x[1]["mXRecord"]:
@@
-1476,7
+1481,8
@@
def ud_generate():
if need_update or options.force:
msg = 'Update forced' if options.force else 'Update needed'
generate_all(generate_dir, l)
if need_update or options.force:
msg = 'Update forced' if options.force else 'Update needed'
generate_all(generate_dir, l)
- mq_notify(options, msg)
+ if use_mq:
+ mq_notify(options, msg)
last_run = int(time.time())
fd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, last_run))
fd.close()
last_run = int(time.time())
fd.write("%s\n%s\n%s\n" % (ldap_last_mod, unix_last_mod, last_run))
fd.close()