1 |
diff -urN smeserver-ddclient-1.3.0.old/createlinks smeserver-ddclient-1.3.0/createlinks |
2 |
--- smeserver-ddclient-1.3.0.old/createlinks 2021-03-03 08:47:20.274725797 +0000 |
3 |
+++ smeserver-ddclient-1.3.0/createlinks 2021-03-05 10:39:46.282345845 +0000 |
4 |
@@ -14,7 +14,7 @@ |
5 |
event_link("systemd-default", $event, "10"); |
6 |
event_link("systemd-reload", $event, "50"); |
7 |
#action specific to this package |
8 |
-event_link("conf-timezone", $event, "30"); |
9 |
+#event_link("conf-timezone", $event, "30"); |
10 |
#services we need to restart |
11 |
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ddclient"); |
12 |
|
13 |
diff -urN smeserver-ddclient-1.3.0.old/root/etc/e-smith/web/functions/ddclient smeserver-ddclient-1.3.0/root/etc/e-smith/web/functions/ddclient |
14 |
--- smeserver-ddclient-1.3.0.old/root/etc/e-smith/web/functions/ddclient 2020-06-28 09:57:50.000000000 +0100 |
15 |
+++ smeserver-ddclient-1.3.0/root/etc/e-smith/web/functions/ddclient 2021-03-05 10:28:32.588601126 +0000 |
16 |
@@ -164,6 +164,49 @@ |
17 |
#------------------------------------------------------------ |
18 |
# subroutine to display initial form |
19 |
#------------------------------------------------------------ |
20 |
+sub get_dns_labels { |
21 |
+ # |
22 |
+ # dns service names from ddclient |
23 |
+ # |
24 |
+ # Better here would be to extract this list from the ddclient package. |
25 |
+ my $Labels = ( |
26 |
+ [ |
27 |
+ 'CUSTOMDNS' , |
28 |
+ 'DYNDNS1' , |
29 |
+ 'DYNDNS2' , |
30 |
+ 'DYNDNS3' , |
31 |
+ 'ZONEDIT' , |
32 |
+ 'EASYDNS' , |
33 |
+ 'HAMMER' , |
34 |
+ 'DSLREPORTS' , |
35 |
+ 'EURODYNDNS' , |
36 |
+ 'DTDNS' , |
37 |
+ 'LOOPIA' , |
38 |
+ 'DNSPARK' , |
39 |
+ 'DYNHOST' , |
40 |
+ 'NOIP' , |
41 |
+ 'CHANGEIP' , |
42 |
+ 'NAMECHEAP' , |
43 |
+ 'SPDNS' , |
44 |
+ 'SITELUTIONS', |
45 |
+ 'FREEDNS', |
46 |
+ 'NSUPDATE', |
47 |
+ 'CLOUDFLARE', |
48 |
+ 'GOOGLEDOMAINS', |
49 |
+ 'DUCKDNS', |
50 |
+ 'FREEMYIP', |
51 |
+ 'WOIMA', |
52 |
+ 'YANDEX', |
53 |
+ 'DNSMADEEASY', |
54 |
+ 'DONDOMINIO', |
55 |
+ 'NFSN', |
56 |
+ 'OVH', |
57 |
+ 'CLOUDNS' |
58 |
+ ] |
59 |
+ ); |
60 |
+ return $Labels; |
61 |
+} |
62 |
+ |
63 |
|
64 |
sub genServer ($$) |
65 |
{ |
66 |
@@ -174,37 +217,20 @@ |
67 |
$curSetting = 'dyndns1'; |
68 |
} |
69 |
|
70 |
- my %Labels = ( |
71 |
- 'CUSTOMDNS' => $fm->localise('CUSTOMDNS'), |
72 |
- 'DYNDNS1' => $fm->localise('DYNDNS1'), |
73 |
- 'DYNDNS2' => $fm->localise('DYNDNS2'), |
74 |
- 'DYNDNS3' => $fm->localise('DYNDNS3'), |
75 |
- 'ZONEDIT' => $fm->localise('ZONEDIT'), |
76 |
- 'EASYDNS' => $fm->localise('EASYDNS'), |
77 |
- 'HAMMER' => $fm->localise('HAMMER'), |
78 |
- 'DSLREPORTS'=> $fm->localise('DSLREPORTS'), |
79 |
- 'EURODYNDNS'=> $fm->localise('EURODYNDNS'), |
80 |
- 'DTDNS' => $fm->localise('DTDNS'), |
81 |
- 'LOOPIA' => $fm->localise('LOOPIA'), |
82 |
- 'DNSPARK' => $fm->localise('DNSPARK'), |
83 |
- 'DYNHOST' => $fm->localise('DYNHOST'), |
84 |
- 'NOIP' => $fm->localise('NOIP'), |
85 |
- 'CHANGEIP' => $fm->localise('CHANGEIP'), |
86 |
- 'NAMECHEAP' => $fm->localise('NAMECHEAP'), |
87 |
- 'SPDNS' => $fm->localise('SPDNS') |
88 |
- ); |
89 |
- |
90 |
+ my $Labels = get_dns_labels(); |
91 |
+ # Create translated description for them |
92 |
+ my %LabelDescriptions; |
93 |
+ foreach my $lab (@$Labels){ |
94 |
+ $LabelDescriptions{$lab}= $fm->localise($lab); |
95 |
+ }; |
96 |
return esmith::cgi::genCell ($q, $q->popup_menu (-name => 'dns', |
97 |
- -values => [ |
98 |
- 'CUSTOMDNS', 'DYNDNS1','DYNDNS2','DYNDNS3','ZONEDIT', |
99 |
- 'EASYDNS','HAMMER','DSLREPORTS', 'EURODYNDNS', |
100 |
- 'DTDNS','LOOPIA','DNSPARK','DYNHOST','NOIP','CHANGEIP', |
101 |
- 'NAMECHEAP','SPDNS' |
102 |
- ], |
103 |
+ -values => $Labels, |
104 |
-default => $curSetting, |
105 |
- -labels => \%Labels)); |
106 |
+ -labels => \%LabelDescriptions)); |
107 |
} |
108 |
|
109 |
+ |
110 |
+ |
111 |
#----------------------------------------------------------------------------------------------------- |
112 |
sub genRetrieve($$) { |
113 |
my ($q, $curSetting) = @_; |
114 |
diff -urN smeserver-ddclient-1.3.0.old/root/usr/lib/systemd/system/ddclient.service.d/50koozali.conf smeserver-ddclient-1.3.0/root/usr/lib/systemd/system/ddclient.service.d/50koozali.conf |
115 |
--- smeserver-ddclient-1.3.0.old/root/usr/lib/systemd/system/ddclient.service.d/50koozali.conf 1970-01-01 01:00:00.000000000 +0100 |
116 |
+++ smeserver-ddclient-1.3.0/root/usr/lib/systemd/system/ddclient.service.d/50koozali.conf 2021-03-05 11:28:28.944223766 +0000 |
117 |
@@ -0,0 +1,5 @@ |
118 |
+[Service] |
119 |
+execStart=/usr/sbin/ddclient $DDCLIENT_OPTIONS |
120 |
+[Install] |
121 |
+WantedBy=sme-server.target |
122 |
+ |