Merge pull request #25 from stephdl/fixcheckIP

Add checkipdynu.com and force nossl for dyndns
stephdl · Nov 27, 2021 · 84e9f8f · 84e9f8f
2 parents 07e5a96 + df6155a
commit 84e9f8f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/api/validate b/api/validate
@@ -39,7 +39,7 @@ $DynDns = $v->createValidator()->memberOf('CHANGEIP','DNSDYNAMIC','DNSPARK',
       'DSLREPORTS','DYNDNS1','DYNDNS2','DYNDNS3','DYNDNSFREE','DYNHOST',
       'DYNU','EASYDNS','EURODYNDNS','FREEDNS','HAMMER','LOOPIA','NAMECHEAP','NOIP','SELFHOST','STRATO','ZONEDIT');
 $urlcheckip = $v->createValidator()->memberOf('checkip.dyndns.org','ipdetect.dnspark.com','checkip.dyndns.org:8245',
-      'ip.changeip.com','myip.dnsdynamic.org');
+      'ip.changeip.com','myip.dnsdynamic.org', 'checkip.dynu.com');
 
 # Validators
 

diff --git a/root/etc/e-smith/db/configuration/defaults/ddclient/urlcheckip b/root/etc/e-smith/db/configuration/defaults/ddclient/urlcheckip
@@ -1 +1 @@
-checkip.dyndns.org
+ip.changeip.com
diff --git a/root/etc/e-smith/templates/etc/ddclient.conf/10Headers b/root/etc/e-smith/templates/etc/ddclient.conf/10Headers
@@ -2,6 +2,9 @@
 my $status = ${ddclient}{status} || 'disabled';
 my $deamonupdate = ${ddclient}{DeamonUpdate} || '300';
 my $ssl = ${ddclient}{SSL} || 'yes';
+my $urlcheckip = ${ddclient}{urlcheckip} || 'checkip.dyndns.org';
+$ssl = 'no' if ( $urlcheckip =~ 'checkip.dyndns.org' );
+
 return '# ddclient is disabled in the configuration database' if $status ne 'enabled';
 
 $OUT .= qq(
@@ -11,6 +14,5 @@ mail=admin\@$DomainName              # mail update msgs to root
 mail-failure=admin\@$DomainName      # mail failure msgs to root
 pid=/var/run/ddclient/ddclient.pid                       # record PID in file.
 ssl=$ssl
-#);
+);
 }
-
diff --git a/root/etc/e-smith/templates/etc/ddclient.conf/20Declaration b/root/etc/e-smith/templates/etc/ddclient.conf/20Declaration
@@ -15,6 +15,7 @@ my $urlcheckip = $ddclient{'urlcheckip'} || 'checkip.dyndns.org';
 
 $OUT .="use=web, web=$urlcheckip\/";
 $OUT .=", web-skip='Current IP Address:' \n" if ($urlcheckip =~ 'checkip.dyndns.org');
+$OUT .=", web-skip='IP Address' \n" if ($urlcheckip =~ 'checkip.dynu.com');
 $OUT .=", web-skip='Current Address:' \n" if ($urlcheckip eq 'ipdetect.dnspark.com'); 
 $OUT .="\n";
 

diff --git a/root/usr/share/nethesis/NethServer/Module/DdClient/DdClientService.php b/root/usr/share/nethesis/NethServer/Module/DdClient/DdClientService.php
@@ -46,9 +46,10 @@ public function prepareView(\Nethgui\View\ViewInterface $view)
         ));
 
         $view['urlcheckipDatasource'] = \Nethgui\Renderer\AbstractRenderer::hashToDatasource(array(
-                 'checkip.dyndns.org' => $view->translate('checkip.dyndns.org'),
-                 'checkip.dyndns.org:8245' => $view->translate('checkip.dyndns.org:8245'),
-                 'ip.changeip.com' => $view->translate('ip.changeip.com')
+                 'checkip.dyndns.org' => $view->translate('no ssl checkip.dyndns.org'),
+                 'checkip.dyndns.org:8245' => $view->translate('no sll checkip.dyndns.org:8245'),
+                 'ip.changeip.com' => $view->translate('ip.changeip.com'),
+                 'checkip.dynu.com' => $view->translate('checkip.dynu.com')
        ));
 
 }

diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue
@@ -27,7 +27,7 @@
               </div>
         </div>
         <div
-          v-if="configuration.status"
+          v-if="configuration.status && ! configuration.urlcheckip.match(/checkip.dyndns.org/g)"
           :class="['form-group', errors.SSL.hasError ? 'has-error' : '']"
         >
           <label
@@ -85,10 +85,11 @@
               v-model="configuration.urlcheckip"
               class="combobox form-control"
             >
-              <option value="checkip.dyndns.org">checkip.dyndns.org</option>
+              <option value="checkip.dyndns.org">no ssl checkip.dyndns.org</option>
               <!-- <option value="ipdetect.dnspark.com">ipdetect.dnspark.com</option> -->
-              <option value="checkip.dyndns.org:8245">checkip.dyndns.org:8245</option>
+              <option value="checkip.dyndns.org:8245">no ssl checkip.dyndns.org:8245</option>
               <option value="ip.changeip.com">ip.changeip.com</option>
+              <option value="checkip.dynu.com">checkip.dynu.com</option>
               <!-- <option value="myip.dnsdynamic.org">myip.dnsdynamic.org</option> -->
             </select>
             <span v-if="errors.urlcheckip.hasError" class="help-block">