/[smecontribs]/rpms/smeserver-userpanel/contribs10/smeserver-userpanel-1.4-bz10261-bz12249.patch
ViewVC logotype

Annotation of /rpms/smeserver-userpanel/contribs10/smeserver-userpanel-1.4-bz10261-bz12249.patch

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


Revision 1.1 - (hide annotations) (download)
Thu Dec 1 06:43:50 2022 UTC (17 months, 3 weeks ago) by jpp
Branch: MAIN
CVS Tags: smeserver-userpanel-1_4-6_el7_sme, HEAD
* Thu Dec 01 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.4-6.sme
- fix translation not expanded [SME: 10261]
- fix httpd admin stopped [SME: 12249]
  moved actions before template and service actions
  removed inline expand and restart

1 jpp 1.1 diff -Nur --no-dereference smeserver-userpanel-1.4.old/createlinks smeserver-userpanel-1.4/createlinks
2     --- smeserver-userpanel-1.4.old/createlinks 2022-12-01 01:35:58.186000000 -0500
3     +++ smeserver-userpanel-1.4/createlinks 2022-12-01 01:40:02.570000000 -0500
4     @@ -9,11 +9,11 @@
5    
6     ##actions conf-userpanelsymlinks
7     for my $event (qw( conf-userpanel bootstrap-console-save console-save post-upgrade remoteaccess-update )){
8     -event_link("conf-userpanelsymlinks", $event, "70");}
9     +event_link("conf-userpanelsymlinks", $event, "03");}
10    
11     ##actions link to translations
12     for my $event (qw( conf-userpanel bootstrap-console-save console-save post-upgrade remoteaccess-update )){
13     -event_link("conf-linktotranslations", $event, "70");}
14     +event_link("conf-linktotranslations", $event, "03");}
15    
16     ##event conf-userpanel
17     my $event = "conf-userpanel";
18     @@ -31,5 +31,5 @@
19     templates2events( "/etc/httpd/admin-conf/httpd.conf",$event);
20     templates2events( "/etc/e-smith/web/common/css/manager.css",$event);
21     templates2events( "/etc/e-smith/web/common/css/manager.css","bootstrap-console-save");
22     -event_link("conf-linktotranslations", $event, "70");
23     -event_link("conf-userpanelsymlinks", $event, "70");
24     +event_link("conf-linktotranslations", $event, "03");
25     +event_link("conf-userpanelsymlinks", $event, "03");
26     diff -Nur --no-dereference smeserver-userpanel-1.4.old/root/etc/e-smith/events/actions/conf-linktotranslations smeserver-userpanel-1.4/root/etc/e-smith/events/actions/conf-linktotranslations
27     --- smeserver-userpanel-1.4.old/root/etc/e-smith/events/actions/conf-linktotranslations 2014-08-22 11:08:39.000000000 -0400
28     +++ smeserver-userpanel-1.4/root/etc/e-smith/events/actions/conf-linktotranslations 2022-12-01 01:36:50.252000000 -0500
29     @@ -1,5 +1,5 @@
30     #!/bin/bash
31     -trad=`ls /etc/e-smith/locale/`
32     +trad=`/usr/bin/ls /etc/e-smith/locale/`
33     for lang in $trad
34     do
35     /bin/mkdir -p /etc/e-smith/locale/$lang/etc/e-smith/web/panels/user
36     diff -Nur --no-dereference smeserver-userpanel-1.4.old/root/etc/e-smith/events/actions/conf-userpanelsymlinks smeserver-userpanel-1.4/root/etc/e-smith/events/actions/conf-userpanelsymlinks
37     --- smeserver-userpanel-1.4.old/root/etc/e-smith/events/actions/conf-userpanelsymlinks 2022-12-01 01:35:58.179000000 -0500
38     +++ smeserver-userpanel-1.4/root/etc/e-smith/events/actions/conf-userpanelsymlinks 2022-12-01 01:40:24.119000000 -0500
39     @@ -81,12 +81,6 @@
40     }
41     }
42    
43     - system("/sbin/e-smith/expand-template /etc/httpd/admin-conf/httpd.conf") == 0
44     - or warn ("Error expanding httpd.conf \n");
45     -
46     - #system("/etc/rc.d/init.d/httpd-admin restart") == 0
47     - # or warn ("Error occurred restarting httpd-admin \n");
48     - esmith::util::backgroundCommand (1, "/usr/bin/systemctl", "restart", "httpd-admin.service");# == 0
49    
50     exit (0);
51    

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed