From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 22 Jun 2014 10:25:55 +0000 (+0000)
Subject: Merge remote-tracking branch 'stevee/twodns.de'
X-Git-Tag: 001~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c7b3e85e6ba03551d31b4848dcf057b016447c8d;p=ddns.git

Merge remote-tracking branch 'stevee/twodns.de'

Conflicts:
	src/ddns/__init__.py
	src/ddns/providers.py
---

c7b3e85e6ba03551d31b4848dcf057b016447c8d
diff --cc src/ddns/__init__.py
index 38b3ad7,18d89ec..f22eb66
--- a/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@@ -106,7 -104,7 +106,8 @@@ class DDNSCore(object)
  			DDNSProviderRegfish,
  			DDNSProviderSelfhost,
  			DDNSProviderSPDNS,
 +			DDNSProviderStrato,
+ 			DDNSProviderTwoDNS,
  			DDNSProviderVariomedia,
  		):
  			self.register_provider(provider)
diff --cc src/ddns/providers.py
index fc03af2,fdc86c6..3d89350
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@@ -780,22 -666,31 +780,45 @@@ class DDNSProviderSPDNS(DDNSProviderDyn
  	# http://wiki.securepoint.de/index.php/SPDNS_Update-Tokens
  
  	url = "https://update.spdns.de/nic/update"
 +
 +
 +class DDNSProviderStrato(DDNSProviderDynDNS):
 +	INFO = {
 +		"handle"    : "strato.com",
 +		"name"      : "Strato AG",
 +		"website"   : "http:/www.strato.com/",
 +		"protocols" : ["ipv4",]
 +	}
 +
 +	# Information about the request and response can be obtained here:
 +	# http://www.strato-faq.de/article/671/So-einfach-richten-Sie-DynDNS-f%C3%BCr-Ihre-Domains-ein.html
 +
 +	url = "https://dyndns.strato.com/nic/update"
  
  
+ class DDNSProviderTwoDNS(DDNSProviderDynDNS):
+ 	INFO = {
+ 		"handle"    : "twodns.de",
+ 		"name"      : "TwoDNS",
+ 		"website"   : "http://www.twodns.de",
+ 		"protocols" : ["ipv4",]
+ 	}
+ 
+ 	# Detailed information about the request can be found here
+ 	# http://twodns.de/en/faqs
+ 	# http://twodns.de/en/api
+ 
+ 	url = "https://update.twodns.de/update"
+ 
+ 	def _prepare_request_data(self):
+ 		data = {
+ 			"ip" : self.get_address("ipv4"),
+ 			"hostname" : self.hostname
+ 		}
+ 
+ 		return data
+ 
+ 
  class DDNSProviderVariomedia(DDNSProviderDynDNS):
  	INFO = {
  		"handle"   : "variomedia.de",