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

Contents of /rpms/smeserver-userpanel/contribs10/smeserver-userpanel-1.4-bz11079.patch

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


Revision 1.2 - (show annotations) (download)
Wed Feb 24 03:38:29 2021 UTC (3 years, 2 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-userpanel-1_4-4_el7_sme, smeserver-userpanel-1_4-5_el7_sme, smeserver-userpanel-1_4-6_el7_sme, smeserver-userpanel-1_4-3_el7_sme, HEAD
Changes since 1.1: +3 -3 lines
* Tue Feb 23 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.4-3.sme
- add -update event to avoid reboot [SME: 11079]
  also fix detection of userpassword file

1 diff -Nur smeserver-userpanel-1.4.old/createlinks smeserver-userpanel-1.4/createlinks
2 --- smeserver-userpanel-1.4.old/createlinks 2017-05-31 12:42:41.000000000 -0400
3 +++ smeserver-userpanel-1.4/createlinks 2021-02-23 22:37:25.040000000 -0500
4 @@ -24,4 +24,12 @@
5 templates2events( "/etc/e-smith/web/common/css/manager.css",$event);
6 templates2events( "/etc/e-smith/web/common/css/manager.css","bootstrap-console-save");
7
8 -
9 +$event = "smeserver-userpanel-update";
10 +safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-admin");
11 +safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
12 +templates2events( "/etc/httpd/conf/httpd.conf",$event);
13 +templates2events( "/etc/httpd/admin-conf/httpd.conf",$event);
14 +templates2events( "/etc/e-smith/web/common/css/manager.css",$event);
15 +templates2events( "/etc/e-smith/web/common/css/manager.css","bootstrap-console-save");
16 +event_link("conf-linktotranslations", $event, "70");
17 +event_link("conf-userpanelsymlinks", $event, "70");
18 diff -Nur smeserver-userpanel-1.4.old/root/etc/e-smith/web/functions/userpanelaccess smeserver-userpanel-1.4/root/etc/e-smith/web/functions/userpanelaccess
19 --- smeserver-userpanel-1.4.old/root/etc/e-smith/web/functions/userpanelaccess 2017-05-31 12:57:14.000000000 -0400
20 +++ smeserver-userpanel-1.4/root/etc/e-smith/web/functions/userpanelaccess 2021-02-23 22:31:11.802000000 -0500
21 @@ -236,7 +236,7 @@
22 my @panels;
23 opendir (DIR, "/etc/e-smith/web/functions")
24 || die "Can't open /etc/e-smith/web/functions directory.\n";
25 - push (@panels, sort (grep (!/^(\.|userpanel-initial|userpanel-navigation|userpanel-noframes|pleasewait|index\.cgi|initial\.cgi|navigation|noframes)/, readdir(DIR))));
26 + push (@panels, sort (grep (!/^(\.|userpanel-initial|userpanel-navigation|userpanel-noframes|pleasewait|index\.cgi|initial\.cgi|navigation|noframes|userpassword)/, readdir(DIR))));
27 closedir (DIR);
28
29 my $panel;

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