/[smeserver]/rpms/smeserver-manager/sme10/smeserver-manager-0.1.0-yum_refresh_version.patch
ViewVC logotype

Annotation of /rpms/smeserver-manager/sme10/smeserver-manager-0.1.0-yum_refresh_version.patch

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

Revision 1.2 - (hide annotations) (download)
Sat Nov 21 08:43:53 2020 UTC (3 years, 7 months ago) by michel
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED 
* Fri Nov 20 2020 Michel Begue <mab974@gmail.com> 0.1.2-2.sme
- Fix smanager-update event name
- Move smanager service to /usr/lib/systemd
- Fix Bugreport file download
- Fix translations missing in 'viewlogfiles'
- Remove Admin auth in httpd configuration
- Add an optional alias for admin sign in.
- Remove systemctl from .spec file
1 michel 1.1 diff -urN smeserver-manager-0.1.0.old/createlinks smeserver-manager-0.1.0/createlinks
2     --- smeserver-manager-0.1.0.old/createlinks 2020-10-05 19:24:31.000000000 +0400
3     +++ smeserver-manager-0.1.0/createlinks 2020-10-07 11:23:22.082000000 +0400
4     @@ -34,8 +34,11 @@
5     "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
6     }
7    
8     +safe_symlink("restart",
9     + "root/etc/e-smith/events/smanager-refresh/services2adjust/smanager");
10     +
11     # actions to perform
12     -for my $event ( qw( smanager-update bootstrap-console-save ) )
13     +for my $event ( qw( smanager-update smanager-refresh bootstrap-console-save ) )
14     {
15     event_link('navigation2-conf', "$event", '80');
16     event_link('routes2-conf', "$event", '80');
17     diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm
18     --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm 2020-08-26 17:45:36.000000000 +0400
19     +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm 2020-10-07 17:32:48.466000000 +0400
20     @@ -17,7 +17,6 @@
21     use SrvMngr qw(theme_list init_session ip_number_or_blank);
22    
23     use esmith::ConfigDB;
24     -use esmith::AccountsDB;
25    
26     use esmith::util;
27     use File::Basename;
28     @@ -53,16 +52,12 @@
29    
30     $yum_datas{'trt'} = 'STAT';
31    
32     - if (-e "/var/run/yum.pid") {
33     + if ( -e "/var/run/yum.pid" ) {
34     $yum_datas{'trt'} = 'LOGF';
35     - #$dest = 'yumlogfile';
36     - $c->stash( title => $title, notif => $notif, yum_datas => \%yum_datas );
37     - return $c->redirect_to("/yumd");
38     - } elsif ($c->get_prop('yum', 'LogFile')) {
39     + $dest = 'yumlogfile';
40     + } elsif ($cdb->get_prop('yum', 'LogFile')) {
41     $yum_datas{'trt'} = 'PSTU';
42     - #$dest = 'yumpostupg';
43     - $c->stash( title => $title, notif => $notif, yum_datas => \%yum_datas );
44     - return $c->redirect_to("/yumd");
45     + $dest = 'yumpostupg';
46     } else {
47     # normal other trt
48     }
49     @@ -86,6 +81,13 @@
50    
51     $yum_datas{'trt'} = $trt;
52    
53     + # force $trt if current logfile
54     + if ( -e "/var/run/yum.pid" ) {
55     + $trt = 'LOGF';
56     + } elsif ($cdb->get_prop('yum', 'LogFile')) {
57     + $trt = 'PSTU';
58     + }
59     +
60     if ( $trt eq 'UPDT' ) {
61     $dest = 'yumupdate';
62     }
63     @@ -109,12 +111,12 @@
64     }
65    
66     if ( $trt eq 'PSTU') {
67     - if ($c->get_prop('yum', 'LogFile')) {
68     + if ($cdb->get_prop('yum', 'LogFile')) {
69     $dest = 'yumpostupg';
70     }
71     }
72    
73     - if ( $dest eq '' ) { $dest = 'yum'; }
74     + if ( ! $dest ) { $dest = 'yum'; }
75    
76     $c->stash( title => $title, notif => $notif, yum_datas => \%yum_datas );
77     return $c->render( template => $dest );
78     @@ -140,20 +142,13 @@
79     if ( $trt eq 'UPDT' ) {
80    
81     $dest = 'yumupdate';
82     -# $yum_datas{xxx} = $c->param('XXX');
83     -
84     - # controls
85     -# $res = xxxxxxx( $c );
86     -# $result .= $res unless $res eq 'OK';
87     -
88     - #$result .= 'Blocked for testing !';
89    
90     if ( ! $result ) {
91     $res = $c->do_yum('update');
92     $result .= $res unless $res eq 'OK';
93     if ( ! $result ) {
94     $yum_datas{trt} = 'SUC';
95     - $result = $c->l('yum_SUCCESS');
96     + #$result = $c->l('yum_SUCCESS');
97     }
98     }
99     }
100     @@ -161,20 +156,13 @@
101     if ( $trt eq 'INST' ) {
102    
103     $dest = 'yuminstall';
104     -# $yum_datas{xxx} = $c->param('XXX');
105     -
106     - # controls
107     -# $res = zzzzzz( $c );
108     -# $result .= $res unless $res eq 'OK';
109     -
110     - #$result .= 'Blocked for testing !';
111    
112     if ( ! $result ) {
113     $res = $c->do_yum('install');
114     $result .= $res unless $res eq 'OK';
115     if ( ! $result ) {
116     $yum_datas{trt} = 'SUC';
117     - $result = $c->l('yum_SUCCESS');
118     + #$result = $c->l('yum_SUCCESS');
119     }
120     }
121     }
122     @@ -182,20 +170,13 @@
123     if ( $trt eq 'REMO' ) {
124    
125     $dest = 'yumremove';
126     -# $yum_datas{xxx} = $c->param('XXX');
127     -
128     - # controls
129     -# $res = yyyyyyyyy( $c );
130     -# $result .= $res unless $res eq 'OK';
131     -
132     - #$result .= 'Blocked for testing !';
133    
134     if ( ! $result ) {
135     - $res = $c->do_yum('config');
136     + $res = $c->do_yum('remove');
137     $result .= $res unless $res eq 'OK';
138     if ( ! $result ) {
139     $yum_datas{trt} = 'SUC';
140     - $result = $c->l('yum_SUCCESS');
141     + #$result = $c->l('yum_SUCCESS');
142     }
143     }
144     }
145     @@ -203,13 +184,6 @@
146     if ( $trt eq 'CONF' ) {
147    
148     $dest = 'yumconfig';
149     -# $yum_datas{xxx} = $c->param('XXX');
150     -
151     - # controls
152     -# $res = $c->zzzz( $c->param('ZZZZ') );
153     -# $result .= $res . ' DMS ' unless $res eq 'OK';
154     -
155     -# $result .= 'Blocked for testing !';
156    
157     if ( ! $result ) {
158     $res = $c->change_settings();
159     @@ -239,36 +213,29 @@
160     $dest = 'yumlogfile';
161     if ( ! -e "/var/run/yum.pid") {
162     $yum_datas{trt} = 'SUC';
163     + $result = $c->l('yum_SUCCESS');
164     }
165     }
166    
167     + # do_yum ended (no message) --> forced to LOGFile
168     + if ( ! $result ) {
169     + $dest = 'yumlogfile';
170     + $yum_datas{trt} = 'LOGF';
171     + }
172    
173    
174     $c->stash( title => $title, notif => $result, yum_datas => \%yum_datas );
175     if ($yum_datas{trt} ne 'SUC') {
176     return $c->render(template => $dest);
177     }
178     - $c->redirect_to("/yum");
179     -
180     -};
181    
182     + my $message = "'Yum' $trt update DONE";
183     + $c->app->log->info($message);
184     + $c->flash(success => $result) if $result;
185    
186     -sub get_prop {
187     - my ($c, $item, $prop, $default) = @_;
188     - warn "You must specify a record key" unless $item;
189     - warn "You must specify a property name" unless $prop;
190     - my $record = $cdb->get($item) or warn "Couldn't get record for $item";
191     - my $value = $record ? $record->prop($prop) : undef;
192     - return defined $value ? $value : $default;
193     -}
194     -
195     + $c->redirect_to("/yum");
196    
197     -sub get_value {
198     - my ($c,$item,$default) = @_;
199     - my $record = $cdb->get($item) or warn "Couldn't get record for $item";
200     - my $value = $record ? $record->value() : undef;
201     - return defined $value ? $value : $default;
202     -}
203     +};
204    
205    
206     sub is_empty {
207     @@ -513,7 +480,9 @@
208     esmith::util::backgroundCommand(0,
209     "/sbin/e-smith/signal-event", "yum-$function");
210    
211     - $cdb->reload;
212     + for ( qw(available installed updates) ) {
213     + $dbs{$_}->reload;
214     + }
215    
216     return 'OK';
217     }
218     @@ -522,7 +491,6 @@
219     sub get_yum_status_page {
220    
221     my ($c) = @_;
222     -
223     my $yum_status;
224    
225     open(YUM_STATUS, "</var/run/yum.status");
226     @@ -530,41 +498,31 @@
227     close(YUM_STATUS);
228    
229     return $yum_status;
230     -
231     }
232    
233    
234     -sub show_file_page {
235     +sub format_yum_log {
236    
237     - my ($c, $filepage) = @_;
238     + my $c = shift;
239    
240     - return '' unless ( $filepage and ( -e "$filepage" ) );
241     + $cdb->reload;
242    
243     - my $out .= sprintf "<PRE>";
244     + my $filepage = $cdb->get_prop('yum', 'LogFile');
245     + return '' unless $filepage and ( -e "$filepage" );
246    
247     + my $out = sprintf "<PRE>";
248     open (FILE, "$filepage");
249     while (<FILE>) {
250     $out .= sprintf("%s", $_);
251     }
252     close FILE;
253     -
254     $out .= sprintf "</PRE>";
255    
256     + undef $filepage;
257     return $out;
258     }
259    
260    
261     -sub format_yum_log {
262     -
263     - my ($c) = @_;
264     -
265     - my $yum_log = $cdb->get_prop('yum', 'LogFile');
266     -
267     - return $c->show_file_page($yum_log);
268     -
269     -}
270     -
271     -
272     sub post_upgrade_reboot {
273    
274     my $c = shift;
275     @@ -582,13 +540,9 @@
276    
277    
278     sub show_yum_log {
279     -
280     my $c = shift;
281     -
282     my $out = $c->format_yum_log();
283     -
284     my $yum_log = $cdb->get_prop_and_delete('yum', 'LogFile');
285     -
286     return $out;
287     }
288    
289     diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr.pm
290     --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr.pm 2020-10-05 17:59:59.000000000 +0400
291     +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr.pm 2020-10-07 11:54:23.345000000 +0400
292     @@ -23,7 +23,7 @@
293     use SrvMngr::Model::Main;
294    
295    
296     -our $VERSION = '1.030';
297     +our $VERSION = '1.031';
298     $VERSION = eval $VERSION;
299    
300     use Exporter 'import';
301     diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep
302     --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2020-08-08 18:57:00.000000000 +0400
303     +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/layouts/default.html.ep 2020-10-04 19:44:44.000000000 +0400
304     @@ -13,6 +13,7 @@
305     %= stylesheet '/css/styles.css'
306     %= include 'partials/_js_imports'
307     %= include 'common_js'
308     + %= content_for 'refresh'
309     </head>
310    
311     <body>
312     diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep
313     --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep 2020-08-08 18:57:00.000000000 +0400
314     +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_footer.html.ep 2020-10-07 18:25:56.521000000 +0400
315     @@ -1,8 +1,8 @@
316     <div id="footer">
317     <HR class="sme-copyrightbar">
318     <font class="sme-copyright">
319     -SME Server <%= session 'releaseVersion' %> - <%= session 'lang' %><br>
320     -Copyright 1999-2006 Mitel Corporation<br>
321     +SME Server <%= session 'releaseVersion' %> - Manager <%= $c->app->VERSION %> - <%= session 'lang' %>
322     +<br>Copyright 1999-2006 Mitel Corporation<br>
323     <%= session 'copyRight' %>
324     <br>Copyright (c) 2013-2016 Koozali Foundation Inc.<br>
325     </font>
326     diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yumconfig.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yumconfig.html.ep
327     --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yumconfig.html.ep 2020-08-08 18:57:00.000000000 +0400
328     +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yumconfig.html.ep 2020-10-07 18:59:11.897000000 +0400
329     @@ -79,7 +79,9 @@
330    
331     %= hidden_field 'trt' => 'CONF'
332     <br>
333     + <div class='center'>
334     %= submit_button $c->l('SAVE'), class => 'action'
335     + </div>
336    
337     % end
338    
339     diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yum.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yum.html.ep
340     --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yum.html.ep 2020-08-08 18:57:00.000000000 +0400
341     +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yum.html.ep 2020-10-07 19:36:20.723000000 +0400
342     @@ -18,9 +18,9 @@
343     </span>
344     %}
345    
346     - <br>Still incomplete click here for previous version -->
347     + <!-- br>Still incomplete click here for previous version
348     <a href="/server-manager/cgi-bin/yum" target='_blank'><b>(Previous Yum version)</b></a>
349     - <br>
350     + <br -->
351    
352    
353     % if ( $c->is_empty('updates') ) {
354     diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yuminstall.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yuminstall.html.ep
355     --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yuminstall.html.ep 2020-08-08 18:57:00.000000000 +0400
356     +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yuminstall.html.ep 2020-10-04 23:56:56.000000000 +0400
357     @@ -47,7 +47,9 @@
358    
359     %= hidden_field 'trt' => 'INST'
360     <br><br>
361     + <div class='center'>
362     %= submit_button $c->l('yum_INSTALL_SOFTWARE'), class => 'action'
363     + </div>
364    
365     % end
366    
367     diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yumlogfile.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yumlogfile.html.ep
368     --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yumlogfile.html.ep 2020-08-08 18:57:00.000000000 +0400
369     +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yumlogfile.html.ep 2020-10-07 19:18:08.290000000 +0400
370     @@ -1,5 +1,9 @@
371     % layout 'default', title => "Sme server 2 - yum_logfile";
372    
373     +% content_for 'refresh' => begin
374     + <meta http-equiv="refresh" content="10">
375     +%end
376     +
377     % content_for 'module' => begin
378    
379     <div id="module">
380     @@ -22,11 +26,13 @@
381    
382     <BR><center><H2>Please Wait - Yum Running (<%= $c->get_yum_status_page() %>)</H2></center>
383    
384     - <%= $c->render_to_string(inline => $c->show_yum_log()) %>
385     + <%= $c->render_to_string(inline => $c->format_yum_log()) %>
386    
387     %= hidden_field 'trt' => 'LOGF'
388     <br>
389     - %= submit_button $c->l('NEXT'), class => 'action'
390     + <!-- div class='center'>
391     + prc= submit_button $c->l('NEXT'), class => 'action'
392     + </div -->
393    
394     % end
395    
396     diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yumpostupg.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yumpostupg.html.ep
397     --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yumpostupg.html.ep 2020-08-08 18:57:00.000000000 +0400
398     +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yumpostupg.html.ep 2020-10-07 19:30:52.976000000 +0400
399     @@ -18,17 +18,19 @@
400     </div>
401     %}
402    
403     - %= form_for 'yumd' => (method => 'POST') => begin
404     + <br><div class=success>
405     + %= $c->render_to_string( inline => l 'yum_HEADER_POSTUPGRADE_REQUIRED' )
406     + </div><br>
407    
408     - <p>
409     - <%= $c->render_to_string(inline => $c->l('yum_HEADER_POSTUPGRADE_REQUIRED')) %>
410     - </p><br>
411     + %= form_for 'yumd' => (method => 'POST') => begin
412    
413     <%= $c->render_to_string(inline => $c->show_yum_log()) %>
414    
415     %= hidden_field 'trt' => 'PSTU'
416     <br>
417     + <div class='center'>
418     %= submit_button $c->l('RECONFIGURE'), class => 'action'
419     + </div>
420    
421     % end
422    
423     diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yumremove.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yumremove.html.ep
424     --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yumremove.html.ep 2020-08-08 18:57:00.000000000 +0400
425     +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yumremove.html.ep 2020-10-04 23:57:47.000000000 +0400
426     @@ -46,7 +46,9 @@
427    
428     %= hidden_field 'trt' => 'REMO'
429     <br>
430     + <div class='center'>
431     %= submit_button $c->l('REMOVE'), class => 'action'
432     + </div>
433    
434     % end
435    
436     diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yumupdate.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yumupdate.html.ep
437     --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/yumupdate.html.ep 2020-08-08 18:57:00.000000000 +0400
438     +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/yumupdate.html.ep 2020-10-04 23:58:00.000000000 +0400
439     @@ -33,7 +33,9 @@
440    
441     %= hidden_field 'trt' => 'UPDT'
442     <br>
443     + <div class='center'>
444     %= submit_button $c->l('yum_INSTALL_UPDATES'), class => 'action'
445     + </div>
446    
447     % end
448    
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed