From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 28 Aug 2014 18:56:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/fixes'
X-Git-Tag: 005~23
X-Git-Url: http://git.ipfire.org/?p=ddns.git;a=commitdiff_plain;h=09981e55ad0a6433363418f64033ca762e2e9e86;hp=-c

Merge remote-tracking branch 'stevee/fixes'
---

09981e55ad0a6433363418f64033ca762e2e9e86
diff --combined src/ddns/providers.py
index 766ce64,4e35a99..b0443a1
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@@ -129,7 -129,7 +129,7 @@@ class DDNSProvider(object)
  
  		# Check if we actually need to update this host.
  		elif self.is_uptodate(self.protocols):
 -			logger.info(_("The dynamic host %(hostname)s (%(provider)s) is already up to date") % \
 +			logger.debug(_("The dynamic host %(hostname)s (%(provider)s) is already up to date") % \
  				{ "hostname" : self.hostname, "provider" : self.name })
  			return
  
@@@ -320,11 -320,6 +320,11 @@@ class DDNSProviderBindNsupdate(DDNSProv
  		if server:
  			scriptlet.append("server %s" % server)
  
 +		# Set the DNS zone the host should be added to.
 +		zone = self.get("zone", None)
 +		if zone:
 +			scriptlet.append("zone %s" % zone)
 +
  		key = self.get("key", None)
  		if key:
  			secret = self.get("secret")
@@@ -521,9 -516,11 +521,11 @@@ class DDNSProviderDynU(DDNSProtocolDynD
  		data = DDNSProtocolDynDNS2._prepare_request_data(self)
  
  		# This one supports IPv6
- 		data.update({
- 			"myipv6"   : self.get_address("ipv6"),
- 		})
+ 		myipv6 = self.get_address("ipv6")
+ 
+ 		# Add update information if we have an IPv6 address.
+ 		if myipv6:
+ 			data["myipv6"] = myipv6
  
  		return data
  
@@@ -541,17 -538,6 +543,17 @@@ class DDNSProviderEasyDNS(DDNSProtocolD
  	url = "http://api.cp.easydns.com/dyn/tomato.php"
  
  
 +class DDNSProviderDomopoli(DDNSProtocolDynDNS2, DDNSProvider):
 +	handle    = "domopoli.de"
 +	name      = "domopoli.de"
 +	website   = "http://domopoli.de/"
 +	protocols = ("ipv4",)
 +
 +	# https://www.domopoli.de/?page=howto#DynDns_start
 +
 +	url = "http://dyndns.domopoli.de/nic/update"
 +
 +
  class DDNSProviderEnomCom(DDNSResponseParserXML, DDNSProvider):
  	handle    = "enom.com"
  	name      = "eNom Inc."
@@@ -614,7 -600,7 +616,7 @@@ class DDNSProviderEntryDNS(DDNSProvider
  
  		# Send update to the server.
  		try:
- 			response = self.send_request(url, method="PUT", data=data)
+ 			response = self.send_request(url, data=data)
  
  		# Handle error codes
  		except urllib2.HTTPError, e: