add new provider it's DNS (https://www.itsdns.de)

Message ID 80d9fc05-8163-88d5-e482-08b0a7f7c07e@stalhut.de
State Accepted
Headers
Series add new provider it's DNS (https://www.itsdns.de) |

Commit Message

Jan Stalhut May 26, 2019, 7:48 a.m. UTC
  ---
  README                |  1 +
  src/ddns/providers.py | 10 ++++++++++
  2 files changed, 11 insertions(+)
  

Comments

Michael Tremer May 26, 2019, 7:30 p.m. UTC | #1
Hello Jan,

Thank you for submitting your patch. It looks good to me.

But unfortunately I wasn’t able to merge it.

I suppose that your email client replaced all tabs with spaces or something:

[root@ipfire ddns]# pwclient git-am -p ddns -s 2265
Applying patch #2265 using "git am -s"
Description: add new provider it's DNS (https://www.itsdns.de)
Applying: add new provider it's DNS (https://www.itsdns.de)
error: patch failed: README:67
error: README: patch does not apply
error: patch failed: src/ddns/providers.py:1108
error: src/ddns/providers.py: patch does not apply
Patch failed at 0001 add new provider it's DNS (https://www.itsdns.de)
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
'git am' failed with exit status 128
[root@ipfire ddns]# git apply -3 .git/rebase-apply/patch
error: patch failed: README:67
Falling back to three-way merge...
error: patch failed: README:67
error: README: patch does not apply
error: patch failed: src/ddns/providers.py:1108
Falling back to three-way merge...
error: patch failed: src/ddns/providers.py:1108
error: src/ddns/providers.py: patch does not apply

Could you check that and send again?

Best,
-Michael

> On 25 May 2019, at 22:48, Jan Stalhut <jan@stalhut.de> wrote:
> 
> ---
> README                |  1 +
> src/ddns/providers.py | 10 ++++++++++
> 2 files changed, 11 insertions(+)
> 
> diff --git a/README b/README
> index d170858..1c5ffd6 100644
> --- a/README
> +++ b/README
> @@ -67,6 +67,7 @@ SUPPORTED PROVIDERS:
>        enom.com
>        entrydns.net
>        freedns.afraid.org
> +       itsdns.de
>        joker.com
>        loopia.se
>        myonlineportal.net
> diff --git a/src/ddns/providers.py b/src/ddns/providers.py
> index ea723e5..a9a0b03 100644
> --- a/src/ddns/providers.py
> +++ b/src/ddns/providers.py
> @@ -1108,6 +1108,16 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
>                # If we got here, some other update error happened.
>                raise DDNSUpdateError
> 
> +class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider):
> +        handle    = "itsdns.de"
> +        name      = "it's DNS"
> +        website   = "http://www.itsdns.de/"
> +        protocols = ("ipv6", "ipv4")
> +
> +        # Information about the format of the HTTP request is to be
> +        # found here: https://www.itsdns.de/dynupdatehelp.htm
> +
> +        url = "https://www.itsdns.de/update.php”
> 

And you could add another empty line here, because we usually have two empty lines after a class.

> class DDNSProviderJoker(DDNSProtocolDynDNS2, DDNSProvider):
>                handle  = "joker.com"
> -- 
> 2.17.1
> _______________________________________________
> ddns mailing list
> ddns@lists.ipfire.org
> https://lists.ipfire.org/mailman/listinfo/ddns
  
Jan Stalhut May 27, 2019, 7:01 a.m. UTC | #2
Hi Michael,

thank you for the fast feedback. Now, you find the patch-file as 
attachment of this email. I hope this works now.

Can you say something on how long it will take to make these changes 
into an ipfire release?

Best regards,
Jan


Am 26.05.19 um 11:30 schrieb Michael Tremer:
> Hello Jan,
> 
> Thank you for submitting your patch. It looks good to me.
> 
> But unfortunately I wasn’t able to merge it.
> 
> I suppose that your email client replaced all tabs with spaces or something:
> 
> [root@ipfire ddns]# pwclient git-am -p ddns -s 2265
> Applying patch #2265 using "git am -s"
> Description: add new provider it's DNS (https://www.itsdns.de)
> Applying: add new provider it's DNS (https://www.itsdns.de)
> error: patch failed: README:67
> error: README: patch does not apply
> error: patch failed: src/ddns/providers.py:1108
> error: src/ddns/providers.py: patch does not apply
> Patch failed at 0001 add new provider it's DNS (https://www.itsdns.de)
> The copy of the patch that failed is found in: .git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 'git am' failed with exit status 128
> [root@ipfire ddns]# git apply -3 .git/rebase-apply/patch
> error: patch failed: README:67
> Falling back to three-way merge...
> error: patch failed: README:67
> error: README: patch does not apply
> error: patch failed: src/ddns/providers.py:1108
> Falling back to three-way merge...
> error: patch failed: src/ddns/providers.py:1108
> error: src/ddns/providers.py: patch does not apply
> 
> Could you check that and send again?
> 
> Best,
> -Michael
> 
>> On 25 May 2019, at 22:48, Jan Stalhut <jan@stalhut.de> wrote:
>>
>> ---
>> README                |  1 +
>> src/ddns/providers.py | 10 ++++++++++
>> 2 files changed, 11 insertions(+)
>>
>> diff --git a/README b/README
>> index d170858..1c5ffd6 100644
>> --- a/README
>> +++ b/README
>> @@ -67,6 +67,7 @@ SUPPORTED PROVIDERS:
>>         enom.com
>>         entrydns.net
>>         freedns.afraid.org
>> +       itsdns.de
>>         joker.com
>>         loopia.se
>>         myonlineportal.net
>> diff --git a/src/ddns/providers.py b/src/ddns/providers.py
>> index ea723e5..a9a0b03 100644
>> --- a/src/ddns/providers.py
>> +++ b/src/ddns/providers.py
>> @@ -1108,6 +1108,16 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
>>                 # If we got here, some other update error happened.
>>                 raise DDNSUpdateError
>>
>> +class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider):
>> +        handle    = "itsdns.de"
>> +        name      = "it's DNS"
>> +        website   = "http://www.itsdns.de/"
>> +        protocols = ("ipv6", "ipv4")
>> +
>> +        # Information about the format of the HTTP request is to be
>> +        # found here: https://www.itsdns.de/dynupdatehelp.htm
>> +
>> +        url = "https://www.itsdns.de/update.php”
>>
> 
> And you could add another empty line here, because we usually have two empty lines after a class.
> 
>> class DDNSProviderJoker(DDNSProtocolDynDNS2, DDNSProvider):
>>                 handle  = "joker.com"
>> -- 
>> 2.17.1
>> _______________________________________________
>> ddns mailing list
>> ddns@lists.ipfire.org
>> https://lists.ipfire.org/mailman/listinfo/ddns
> 


Mit freundlichen Grüßen
Jan Stalhut
  
Michael Tremer May 28, 2019, 1:29 a.m. UTC | #3
Hello Jan,

This one time I will accept the file :)

The downside of files is that you cannot have inline comments in them which makes the conversation around the patch a bit more difficult.

However, this is merged now. I have tagged a new release of ddns and integrated that into the next tree of IPFire:

  https://git.ipfire.org/?p=ddns.git;a=commitdiff;h=327095f0ea7f80b782664dbc9cb0fce68c7e19cd

This will eventually become Core Update 133 and I would suppose that this will be available in around 6 weeks. We don’t even have 132 out, yet.

Hope this is okay.

Best,
-Michael

> On 26 May 2019, at 22:01, Jan Stalhut <jan@stalhut.de> wrote:
> 
> Hi Michael,
> 
> thank you for the fast feedback. Now, you find the patch-file as attachment of this email. I hope this works now.
> 
> Can you say something on how long it will take to make these changes into an ipfire release?
> 
> Best regards,
> Jan
> 
> 
> Am 26.05.19 um 11:30 schrieb Michael Tremer:
>> Hello Jan,
>> Thank you for submitting your patch. It looks good to me.
>> But unfortunately I wasn’t able to merge it.
>> I suppose that your email client replaced all tabs with spaces or something:
>> [root@ipfire ddns]# pwclient git-am -p ddns -s 2265
>> Applying patch #2265 using "git am -s"
>> Description: add new provider it's DNS (https://www.itsdns.de)
>> Applying: add new provider it's DNS (https://www.itsdns.de)
>> error: patch failed: README:67
>> error: README: patch does not apply
>> error: patch failed: src/ddns/providers.py:1108
>> error: src/ddns/providers.py: patch does not apply
>> Patch failed at 0001 add new provider it's DNS (https://www.itsdns.de)
>> The copy of the patch that failed is found in: .git/rebase-apply/patch
>> When you have resolved this problem, run "git am --continue".
>> If you prefer to skip this patch, run "git am --skip" instead.
>> To restore the original branch and stop patching, run "git am --abort".
>> 'git am' failed with exit status 128
>> [root@ipfire ddns]# git apply -3 .git/rebase-apply/patch
>> error: patch failed: README:67
>> Falling back to three-way merge...
>> error: patch failed: README:67
>> error: README: patch does not apply
>> error: patch failed: src/ddns/providers.py:1108
>> Falling back to three-way merge...
>> error: patch failed: src/ddns/providers.py:1108
>> error: src/ddns/providers.py: patch does not apply
>> Could you check that and send again?
>> Best,
>> -Michael
>>> On 25 May 2019, at 22:48, Jan Stalhut <jan@stalhut.de> wrote:
>>> 
>>> ---
>>> README                |  1 +
>>> src/ddns/providers.py | 10 ++++++++++
>>> 2 files changed, 11 insertions(+)
>>> 
>>> diff --git a/README b/README
>>> index d170858..1c5ffd6 100644
>>> --- a/README
>>> +++ b/README
>>> @@ -67,6 +67,7 @@ SUPPORTED PROVIDERS:
>>>        enom.com
>>>        entrydns.net
>>>        freedns.afraid.org
>>> +       itsdns.de
>>>        joker.com
>>>        loopia.se
>>>        myonlineportal.net
>>> diff --git a/src/ddns/providers.py b/src/ddns/providers.py
>>> index ea723e5..a9a0b03 100644
>>> --- a/src/ddns/providers.py
>>> +++ b/src/ddns/providers.py
>>> @@ -1108,6 +1108,16 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
>>>                # If we got here, some other update error happened.
>>>                raise DDNSUpdateError
>>> 
>>> +class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider):
>>> +        handle    = "itsdns.de"
>>> +        name      = "it's DNS"
>>> +        website   = "http://www.itsdns.de/"
>>> +        protocols = ("ipv6", "ipv4")
>>> +
>>> +        # Information about the format of the HTTP request is to be
>>> +        # found here: https://www.itsdns.de/dynupdatehelp.htm
>>> +
>>> +        url = "https://www.itsdns.de/update.php”
>>> 
>> And you could add another empty line here, because we usually have two empty lines after a class.
>>> class DDNSProviderJoker(DDNSProtocolDynDNS2, DDNSProvider):
>>>                handle  = "joker.com"
>>> -- 
>>> 2.17.1
>>> _______________________________________________
>>> ddns mailing list
>>> ddns@lists.ipfire.org
>>> https://lists.ipfire.org/mailman/listinfo/ddns
> 
> 
> Mit freundlichen Grüßen
> Jan Stalhut
> 
> -- 
> Jan Stalhut
> Rostocker Str. 21
> 27211 Bassum
> 
> Tel. 04241 8208797
> Mobil 0171 5380915
> 
> Facebook -> http://facebook.com/jan.stalhut
> <0001-add-new-provider-it-s-DNS-https-www.itsdns.de.patch>
  
Jan Stalhut July 3, 2019, 9:33 p.m. UTC | #4
Hello Michael,

in the meantime, I've updated IPfire on some of my clients to Core 
Update 134, but there are no new DDNS providers in the web interface.

I read on the changelog of Core Update 133 this line:
    ddns: Some new provides have been added

Has anything gone wrong with the update?

Best regards,
Jan


Am 27.05.19 um 17:29 schrieb Michael Tremer:
> Hello Jan,
> 
> This one time I will accept the file :)
> 
> The downside of files is that you cannot have inline comments in them which makes the conversation around the patch a bit more difficult.
> 
> However, this is merged now. I have tagged a new release of ddns and integrated that into the next tree of IPFire:
> 
>    https://git.ipfire.org/?p=ddns.git;a=commitdiff;h=327095f0ea7f80b782664dbc9cb0fce68c7e19cd
> 
> This will eventually become Core Update 133 and I would suppose that this will be available in around 6 weeks. We don’t even have 132 out, yet.
> 
> Hope this is okay.
> 
> Best,
> -Michael
> 
>> On 26 May 2019, at 22:01, Jan Stalhut <jan@stalhut.de> wrote:
>>
>> Hi Michael,
>>
>> thank you for the fast feedback. Now, you find the patch-file as attachment of this email. I hope this works now.
>>
>> Can you say something on how long it will take to make these changes into an ipfire release?
>>
>> Best regards,
>> Jan
>>
>>
>> Am 26.05.19 um 11:30 schrieb Michael Tremer:
>>> Hello Jan,
>>> Thank you for submitting your patch. It looks good to me.
>>> But unfortunately I wasn’t able to merge it.
>>> I suppose that your email client replaced all tabs with spaces or something:
>>> [root@ipfire ddns]# pwclient git-am -p ddns -s 2265
>>> Applying patch #2265 using "git am -s"
>>> Description: add new provider it's DNS (https://www.itsdns.de)
>>> Applying: add new provider it's DNS (https://www.itsdns.de)
>>> error: patch failed: README:67
>>> error: README: patch does not apply
>>> error: patch failed: src/ddns/providers.py:1108
>>> error: src/ddns/providers.py: patch does not apply
>>> Patch failed at 0001 add new provider it's DNS (https://www.itsdns.de)
>>> The copy of the patch that failed is found in: .git/rebase-apply/patch
>>> When you have resolved this problem, run "git am --continue".
>>> If you prefer to skip this patch, run "git am --skip" instead.
>>> To restore the original branch and stop patching, run "git am --abort".
>>> 'git am' failed with exit status 128
>>> [root@ipfire ddns]# git apply -3 .git/rebase-apply/patch
>>> error: patch failed: README:67
>>> Falling back to three-way merge...
>>> error: patch failed: README:67
>>> error: README: patch does not apply
>>> error: patch failed: src/ddns/providers.py:1108
>>> Falling back to three-way merge...
>>> error: patch failed: src/ddns/providers.py:1108
>>> error: src/ddns/providers.py: patch does not apply
>>> Could you check that and send again?
>>> Best,
>>> -Michael
>>>> On 25 May 2019, at 22:48, Jan Stalhut <jan@stalhut.de> wrote:
>>>>
>>>> ---
>>>> README                |  1 +
>>>> src/ddns/providers.py | 10 ++++++++++
>>>> 2 files changed, 11 insertions(+)
>>>>
>>>> diff --git a/README b/README
>>>> index d170858..1c5ffd6 100644
>>>> --- a/README
>>>> +++ b/README
>>>> @@ -67,6 +67,7 @@ SUPPORTED PROVIDERS:
>>>>         enom.com
>>>>         entrydns.net
>>>>         freedns.afraid.org
>>>> +       itsdns.de
>>>>         joker.com
>>>>         loopia.se
>>>>         myonlineportal.net
>>>> diff --git a/src/ddns/providers.py b/src/ddns/providers.py
>>>> index ea723e5..a9a0b03 100644
>>>> --- a/src/ddns/providers.py
>>>> +++ b/src/ddns/providers.py
>>>> @@ -1108,6 +1108,16 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
>>>>                 # If we got here, some other update error happened.
>>>>                 raise DDNSUpdateError
>>>>
>>>> +class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider):
>>>> +        handle    = "itsdns.de"
>>>> +        name      = "it's DNS"
>>>> +        website   = "http://www.itsdns.de/"
>>>> +        protocols = ("ipv6", "ipv4")
>>>> +
>>>> +        # Information about the format of the HTTP request is to be
>>>> +        # found here: https://www.itsdns.de/dynupdatehelp.htm
>>>> +
>>>> +        url = "https://www.itsdns.de/update.php”
>>>>
>>> And you could add another empty line here, because we usually have two empty lines after a class.
>>>> class DDNSProviderJoker(DDNSProtocolDynDNS2, DDNSProvider):
>>>>                 handle  = "joker.com"
>>>> -- 
>>>> 2.17.1
>>>> _______________________________________________
>>>> ddns mailing list
>>>> ddns@lists.ipfire.org
>>>> https://lists.ipfire.org/mailman/listinfo/ddns
>>
>
  
Michael Tremer July 5, 2019, 4:35 a.m. UTC | #5
Hi Jan,

Yes, I broke this in the updater. I simply forgot to include the package.

A new installation should already show it.

https://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff;h=8650d11bc3a6e506e08dd708ec3f86fd566bb182

This will now be shipped with Core Update 135. Sorry for this mess.

Best,
-Michael

> On 3 Jul 2019, at 12:33, Jan Stalhut <jan@stalhut.de> wrote:
> 
> Hello Michael,
> 
> in the meantime, I've updated IPfire on some of my clients to Core Update 134, but there are no new DDNS providers in the web interface.
> 
> I read on the changelog of Core Update 133 this line:
>   ddns: Some new provides have been added
> 
> Has anything gone wrong with the update?
> 
> Best regards,
> Jan
> 
> 
> Am 27.05.19 um 17:29 schrieb Michael Tremer:
>> Hello Jan,
>> This one time I will accept the file :)
>> The downside of files is that you cannot have inline comments in them which makes the conversation around the patch a bit more difficult.
>> However, this is merged now. I have tagged a new release of ddns and integrated that into the next tree of IPFire:
>>   https://git.ipfire.org/?p=ddns.git;a=commitdiff;h=327095f0ea7f80b782664dbc9cb0fce68c7e19cd
>> This will eventually become Core Update 133 and I would suppose that this will be available in around 6 weeks. We don’t even have 132 out, yet.
>> Hope this is okay.
>> Best,
>> -Michael
>>> On 26 May 2019, at 22:01, Jan Stalhut <jan@stalhut.de> wrote:
>>> 
>>> Hi Michael,
>>> 
>>> thank you for the fast feedback. Now, you find the patch-file as attachment of this email. I hope this works now.
>>> 
>>> Can you say something on how long it will take to make these changes into an ipfire release?
>>> 
>>> Best regards,
>>> Jan
>>> 
>>> 
>>> Am 26.05.19 um 11:30 schrieb Michael Tremer:
>>>> Hello Jan,
>>>> Thank you for submitting your patch. It looks good to me.
>>>> But unfortunately I wasn’t able to merge it.
>>>> I suppose that your email client replaced all tabs with spaces or something:
>>>> [root@ipfire ddns]# pwclient git-am -p ddns -s 2265
>>>> Applying patch #2265 using "git am -s"
>>>> Description: add new provider it's DNS (https://www.itsdns.de)
>>>> Applying: add new provider it's DNS (https://www.itsdns.de)
>>>> error: patch failed: README:67
>>>> error: README: patch does not apply
>>>> error: patch failed: src/ddns/providers.py:1108
>>>> error: src/ddns/providers.py: patch does not apply
>>>> Patch failed at 0001 add new provider it's DNS (https://www.itsdns.de)
>>>> The copy of the patch that failed is found in: .git/rebase-apply/patch
>>>> When you have resolved this problem, run "git am --continue".
>>>> If you prefer to skip this patch, run "git am --skip" instead.
>>>> To restore the original branch and stop patching, run "git am --abort".
>>>> 'git am' failed with exit status 128
>>>> [root@ipfire ddns]# git apply -3 .git/rebase-apply/patch
>>>> error: patch failed: README:67
>>>> Falling back to three-way merge...
>>>> error: patch failed: README:67
>>>> error: README: patch does not apply
>>>> error: patch failed: src/ddns/providers.py:1108
>>>> Falling back to three-way merge...
>>>> error: patch failed: src/ddns/providers.py:1108
>>>> error: src/ddns/providers.py: patch does not apply
>>>> Could you check that and send again?
>>>> Best,
>>>> -Michael
>>>>> On 25 May 2019, at 22:48, Jan Stalhut <jan@stalhut.de> wrote:
>>>>> 
>>>>> ---
>>>>> README                |  1 +
>>>>> src/ddns/providers.py | 10 ++++++++++
>>>>> 2 files changed, 11 insertions(+)
>>>>> 
>>>>> diff --git a/README b/README
>>>>> index d170858..1c5ffd6 100644
>>>>> --- a/README
>>>>> +++ b/README
>>>>> @@ -67,6 +67,7 @@ SUPPORTED PROVIDERS:
>>>>>        enom.com
>>>>>        entrydns.net
>>>>>        freedns.afraid.org
>>>>> +       itsdns.de
>>>>>        joker.com
>>>>>        loopia.se
>>>>>        myonlineportal.net
>>>>> diff --git a/src/ddns/providers.py b/src/ddns/providers.py
>>>>> index ea723e5..a9a0b03 100644
>>>>> --- a/src/ddns/providers.py
>>>>> +++ b/src/ddns/providers.py
>>>>> @@ -1108,6 +1108,16 @@ class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
>>>>>                # If we got here, some other update error happened.
>>>>>                raise DDNSUpdateError
>>>>> 
>>>>> +class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider):
>>>>> +        handle    = "itsdns.de"
>>>>> +        name      = "it's DNS"
>>>>> +        website   = "http://www.itsdns.de/"
>>>>> +        protocols = ("ipv6", "ipv4")
>>>>> +
>>>>> +        # Information about the format of the HTTP request is to be
>>>>> +        # found here: https://www.itsdns.de/dynupdatehelp.htm
>>>>> +
>>>>> +        url = "https://www.itsdns.de/update.php”
>>>>> 
>>>> And you could add another empty line here, because we usually have two empty lines after a class.
>>>>> class DDNSProviderJoker(DDNSProtocolDynDNS2, DDNSProvider):
>>>>>                handle  = "joker.com"
>>>>> -- 
>>>>> 2.17.1
>>>>> _______________________________________________
>>>>> ddns mailing list
>>>>> ddns@lists.ipfire.org
>>>>> https://lists.ipfire.org/mailman/listinfo/ddns
>>> 
>
  

Patch

diff --git a/README b/README
index d170858..1c5ffd6 100644
--- a/README
+++ b/README
@@ -67,6 +67,7 @@  SUPPORTED PROVIDERS:
         enom.com
         entrydns.net
         freedns.afraid.org
+       itsdns.de
         joker.com
         loopia.se
         myonlineportal.net
diff --git a/src/ddns/providers.py b/src/ddns/providers.py
index ea723e5..a9a0b03 100644
--- a/src/ddns/providers.py
+++ b/src/ddns/providers.py
@@ -1108,6 +1108,16 @@  class DDNSProviderFreeDNSAfraidOrg(DDNSProvider):
                 # If we got here, some other update error happened.
                 raise DDNSUpdateError

+class DDNSProviderItsdns(DDNSProtocolDynDNS2, DDNSProvider):
+        handle    = "itsdns.de"
+        name      = "it's DNS"
+        website   = "http://www.itsdns.de/"
+        protocols = ("ipv6", "ipv4")
+
+        # Information about the format of the HTTP request is to be
+        # found here: https://www.itsdns.de/dynupdatehelp.htm
+
+        url = "https://www.itsdns.de/update.php"

  class DDNSProviderJoker(DDNSProtocolDynDNS2, DDNSProvider):
                 handle  = "joker.com"