From 877570fc9e292e0c9df0bd5581f4bd9e14f2d6f9 Mon Sep 17 00:00:00 2001
From: Christoph Berg <myon@oftc.net>
Date: Mon, 27 Mar 2017 09:59:12 +0800
Subject: [PATCH] Add option "use_mq" to allow disabling the use of mq_notify
 in ud-generate

---
 ud-generate       | 4 +++-
 userdir-ldap.conf | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ud-generate b/ud-generate
index 629315f..125a20e 100755
--- a/ud-generate
+++ b/ud-generate
@@ -77,6 +77,7 @@ GitoliteSSHRestrictions = getattr(ConfModule, "gitolitesshrestrictions", None)
 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)
@@ -1479,7 +1480,8 @@ def ud_generate():
    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()
diff --git a/userdir-ldap.conf b/userdir-ldap.conf
index 0cdcdf3..ea9d2ac 100644
--- a/userdir-ldap.conf
+++ b/userdir-ldap.conf
@@ -90,3 +90,6 @@ countrylist = "/var/www/userdir-ldap/domains.tab";
 dns_hostmatch = "[a-zA-Z0-9\.]+\.debian\.org$"
 
 MX_remap = '{"0 INCOMING-MX": ["10 mailly.debian.org.", "10 merikanto.debian.org.", "10 muffat.debian.org."]}'
+
+# MQ notification
+use_mq = True;
-- 
2.20.1