Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add checkipdynu.com and force nossl for dyndns #25

Merged
merged 8 commits into from
Nov 27, 2021
Merged

Add checkipdynu.com and force nossl for dyndns #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ca12512
default is ip.changeip.com
stephdl Nov 27, 2021
d6faf3c
api. no ssl forced for checkip.dyndns.org
stephdl Nov 27, 2021
d89b08e
validation. added checkip.dynu.com
stephdl Nov 27, 2021
0e9f831
nethgui added checkip.dynu.com
stephdl Nov 27, 2021
f40fc76
api.added web-skip for checkip.dynu.com
stephdl Nov 27, 2021
045cc89
vujs added checkip.dynu.com
stephdl Nov 27, 2021
f5dbf4b
do not display ssl if match checkip.dyndns.org
stephdl Nov 27, 2021
df6155a
Merge branch 'ns7' into fixcheckIP
stephdl Nov 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/validate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion root/etc/e-smith/db/configuration/defaults/ddclient/urlcheckip
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
checkip.dyndns.org
ip.changeip.com
6 changes: 4 additions & 2 deletions root/etc/e-smith/templates/etc/ddclient.conf/10Headers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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
#);
);
}

1 change: 1 addition & 0 deletions root/etc/e-smith/templates/etc/ddclient.conf/20Declaration
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
7 changes: 4 additions & 3 deletions root/usr/share/nethesis/NethServer/Module/DdClient/DdClientService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
));

}
Expand Down
7 changes: 4 additions & 3 deletions ui/src/views/Settings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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">
Expand Down