/[smecontribs]/rpms/smeserver-ddclient/contribs10/smeserver-ddclient-1.3.0-bz11667-Update-Events-and-Links.patch
ViewVC logotype

Annotation of /rpms/smeserver-ddclient/contribs10/smeserver-ddclient-1.3.0-bz11667-Update-Events-and-Links.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Tue Aug 31 11:46:10 2021 UTC (2 years, 8 months ago) by jcrisp
Branch: MAIN
CVS Tags: smeserver-ddclient-1_3_0-19_el7_sme, smeserver-ddclient-1_3_0-15_el7_sme, smeserver-ddclient-1_3_0-22_el7_sme, smeserver-ddclient-1_3_0-14_el7_sme, smeserver-ddclient-1_3_0-21_el7_sme, smeserver-ddclient-1_3_0-31_el7_sme, smeserver-ddclient-1_3_0-23_el7_sme, smeserver-ddclient-1_3_0-24_el7_sme, smeserver-ddclient-1_3_0-32_el7_sme, smeserver-ddclient-1_3_0-27_el7_sme, smeserver-ddclient-1_3_0-33_el7_sme, smeserver-ddclient-1_3_0-26_el7_sme, smeserver-ddclient-1_3_0-30_el7_sme, smeserver-ddclient-1_3_0-20_el7_sme, smeserver-ddclient-1_3_0-29_el7_sme, smeserver-ddclient-1_3_0-16_el7_sme, smeserver-ddclient-1_3_0-28_el7_sme, smeserver-ddclient-1_3_0-25_el7_sme, smeserver-ddclient-1_3_0-17_el7_sme, smeserver-ddclient-1_3_0-18_el7_sme, HEAD 
* Tue Aug 31 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 1.3.0-14.sme
- Fix events in ddclient web script [SME:11667]
- Add service link in domain-create
1 jcrisp 1.1 diff -ruN smeserver-ddclient-1.3.0.old/createlinks smeserver-ddclient-1.3.0/createlinks
2     --- smeserver-ddclient-1.3.0.old/createlinks 2021-08-30 11:21:47.269902719 +0200
3     +++ smeserver-ddclient-1.3.0/createlinks 2021-08-31 13:35:40.861235369 +0200
4     @@ -6,20 +6,36 @@
5    
6     # our event specific for updating with yum without reboot
7     $event = "smeserver-ddclient-update";
8     -foreach my $file (qw(/etc/systemd/system-preset/49-koozali.preset /etc/ddclient/ddclient.conf /etc/ppp/ip-up.local))
9     +
10     +foreach my $file (qw(
11     + /etc/systemd/system-preset/49-koozali.preset
12     + /etc/ddclient/ddclient.conf
13     + /etc/ppp/ip-up.local
14     + ))
15     {
16     templates2events( $file, $event );
17     }
18     +
19     +
20     #action needed in case we have a systemd unit
21     event_link("systemd-default", $event, "10");
22     event_link("systemd-reload", $event, "50");
23     +
24     #action specific to this package
25     #event_link("conf-timezone", $event, "30");
26     +
27     +
28     #services we need to restart
29     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ddclient");
30    
31     +
32     #service_link_enhanced("ddclient", "S65", "7");
33    
34     +
35     +$event = 'domain-create';
36     + safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ddclient");
37     + templates2events("/etc/ddclient/ddclient.conf", $event);
38     +
39     $event = 'domain-delete';
40     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/ddclient");
41     templates2events("/etc/ddclient/ddclient.conf", $event);
42     diff -ruN 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
43     --- smeserver-ddclient-1.3.0.old/root/etc/e-smith/web/functions/ddclient 2021-08-30 11:21:47.135900551 +0200
44     +++ smeserver-ddclient-1.3.0/root/etc/e-smith/web/functions/ddclient 2021-08-31 13:33:02.509684681 +0200
45     @@ -61,7 +61,7 @@
46     sub genRetrieveMethod($$);
47     sub performRetrieve($);
48    
49     -################################################################################################################"
50     +#######################################################################
51     BEGIN
52     {
53     # Clear PATH and related environment variables so that calls to
54     @@ -231,7 +231,7 @@
55    
56    
57    
58     -#-----------------------------------------------------------------------------------------------------
59     +#------------------------------------------------------------
60     sub genRetrieve($$) {
61     my ($q, $curSetting) = @_;
62    
63     @@ -560,7 +560,7 @@
64    
65     $domaindb->reload();
66    
67     - system ("/sbin/e-smith/signal-event", "ddclient");
68     + system ("/sbin/e-smith/signal-event", "smeserver-ddclient-update");
69    
70     showInitial ($q, $fm->localise('SUCCESSFULLY_MODIFIED_RETRIEVE_IP'));
71     }
72     @@ -705,7 +705,7 @@
73    
74     $domaindb->new_record($domainName, \%properties);
75    
76     - system ("/sbin/e-smith/signal-event", "ddclient");
77     + system ("/sbin/e-smith/signal-event", "domain-create");
78    
79     showInitial ($q, $fm->localise('SUCCESSFULLY_CREATED',
80     {domainName => $domainName,dns => $fm->localise($dns) }));
81     @@ -885,7 +885,7 @@
82    
83     $domaindb->reload();
84    
85     - system ("/sbin/e-smith/signal-event", "ddclient");
86     + system ("/sbin/e-smith/signal-event", "domain-modify");
87    
88     showInitial ($q, $fm->localise('SUCCESSFULLY_MODIFIED',
89     {domainName => $domainName,dns => $fm->localise($dns)}));
90     @@ -987,13 +987,13 @@
91    
92     $domaindb->reload();
93    
94     - system ("/sbin/e-smith/signal-event", "ddclient");
95     + system ("/sbin/e-smith/signal-event", "domain-delete");
96    
97     showInitial ($q, $fm->localise('SUCCESSFULLY_DELETED',
98     {domain => $domain, dns => $dns}));
99     }
100    
101     -##################################################################################################################################################
102     +#######################################################################
103     # create a free publish
104     #
105     sub ddcreateDomain ($)
106     @@ -1147,7 +1147,7 @@
107     $properties{'customprotocol'} = $customPROTOCOL;
108     $edb->new_record($domainName, \%properties);
109    
110     - system ("/sbin/e-smith/signal-event", "ddclient");
111     + system ("/sbin/e-smith/signal-event", "domain-create");
112    
113     showInitial ($q, $fm->localise('SUCCESSFULLY_CREATED',
114     {domainName => $domainName,dns => $fm->localise($dns) }));
115     @@ -1309,7 +1309,7 @@
116    
117     $edb->reload();
118    
119     - system ("/sbin/e-smith/signal-event", "ddclient");
120     + system ("/sbin/e-smith/signal-event", "domain-modify");
121    
122     showInitial ($q, $fm->localise('SUCCESSFULLY_MODIFIED',
123     {domainName => $domainName,dns => $fm->localise($dns)}));
124     @@ -1403,13 +1403,13 @@
125     $evalue->delete;
126     $edb->reload();
127    
128     - system ("/sbin/e-smith/signal-event", "ddclient");
129     + system ("/sbin/e-smith/signal-event", "domain-delete");
130    
131     showInitial ($q, $fm->localise('SUCCESSFULLY_DELETED',
132     {domain => $domain, dns => $dns}));
133     }
134    
135     -#################################################################################################
136     +#######################################################################
137    
138     __DATA__
139     <form>
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed