show less output when updating DNS configuration

management/dns_update.py

@@ -31,19 +31,27 @@ def do_dns_update(env):
 			updated_domains.append(domain)
 
 	# Write the main nsd.conf file.
-	write_nsd_conf(zonefiles)
+	if write_nsd_conf(zonefiles):
+		# Make sure updated_domains contains *something* if we wrote an updated
+		# nsd.conf so that we know to restart nsd.
+		if len(updated_domains) == 0:
+			updated_domains.append("DNS configuration")
+
+	# Kick nsd if anything changed.
+	if len(updated_domains) > 0:
+		os.system("service nsd restart")
 
 	# Write the OpenDKIM configuration tables.
 	write_opendkim_tables(zonefiles, env)
 
-	# Kick nsd.
-	os.system("service nsd restart")
-
 	# Kick opendkim.
 	os.system("service opendkim restart")
 
-	if len(updated_domains) == 0: updated_domains = ['(no domains required an update)']
+	if len(updated_domains) == 0:
-	return "Updated: " + ",".join(updated_domains) + "\n"
+		# if nothing was updated (except maybe DKIM), don't show any output
+		return ""
+	else:
+		return "updated: " + ",".join(updated_domains) + "\n"
 
 ########################################################################
 
@@ -136,8 +144,7 @@ $TTL 86400           ; default time to live
 ########################################################################
 
 def write_nsd_conf(zonefiles):
-	with open("/etc/nsd/nsd.conf", "w") as f:
+	nsdconf = """
-		f.write("""
 server:
   hide-version: yes
 
@@ -148,14 +155,25 @@ server:
   zonesdir: "/etc/nsd/zones"
   
 # ZONES
-""")
+"""
 
 	for domain, zonefile in zonefiles:
-			f.write("""
+		nsdconf += """
 zone:
 	name: %s
 	zonefile: %s
-""" % (domain, zonefile))
+""" % (domain, zonefile)
+
+	# Check if the nsd.conf is changing. If it isn't changing,
+	# return False to flag that no change was made.
+	with open("/etc/nsd/nsd.conf") as f:
+		if f.read() == nsdconf:
+			return False
+
+	with open("/etc/nsd/nsd.conf", "w") as f:
+		f.write(nsdconf)
+
+	return True
 
 ########################################################################
 

setup/start.sh

@@ -115,7 +115,7 @@ EOF
 
 # Write the DNS configuration files.
 sleep 5 # wait for the daemon to start
-curl -d POSTDATA http://127.0.0.1:10222/dns/update
+curl -s -d POSTDATA http://127.0.0.1:10222/dns/update
 
 # If there aren't any mail users yet, create one.
 if [ -z "`tools/mail.py user`" ]; then