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

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

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

005d325c3b7aa4d79db6ecd600a269ef15bf8f14
diff --cc ddns.conf.sample
index 9075536,b984ea5..0a05782
--- a/ddns.conf.sample
+++ b/ddns.conf.sample
@@@ -99,11 -94,11 +99,16 @@@
  # username = user
  # password = pass
  
 +# [test.twodns.de]
 +# provider = twodns.de
 +# username = user
 +# password = pass
 +
+ # [test.udmedia.de]
+ # provider = udmedia.de
+ # username = user
+ # password = pass
+ 
  # [test.variomedia.de]
  # provider = variomedia.de
  # username = user
diff --cc src/ddns/__init__.py
index f22eb66,413215b..7e5be00
--- a/src/ddns/__init__.py
+++ b/src/ddns/__init__.py
@@@ -106,8 -106,7 +106,9 @@@ class DDNSCore(object)
  			DDNSProviderRegfish,
  			DDNSProviderSelfhost,
  			DDNSProviderSPDNS,
 +			DDNSProviderStrato,
 +			DDNSProviderTwoDNS,
+ 			DDNSProviderUdmedia,
  			DDNSProviderVariomedia,
  		):
  			self.register_provider(provider)
diff --cc src/ddns/providers.py
index 3d89350,c027c39..aa4546c
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@@ -782,43 -782,20 +782,57 @@@ class DDNSProviderSPDNS(DDNSProviderDyn
  	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 DDNSProviderUdmedia(DDNSProviderDynDNS):
+ 	INFO = {
+ 		"handle"    : "udmedia.de",
+ 		"name"      : "Udmedia GmbH",
+ 		"website"   : "http://www.udmedia.de",
+ 		"protocols" : ["ipv4",]
+ 	}
+ 
+ 	# Information about the request can be found here
+ 	# http://www.udmedia.de/faq/content/47/288/de/wie-lege-ich-einen-dyndns_eintrag-an.html
+ 
+ 	url = "https://www.udmedia.de/nic/update"
+ 
+ 
  class DDNSProviderVariomedia(DDNSProviderDynDNS):
  	INFO = {
  		"handle"   : "variomedia.de",