/[smecontribs]/rpms/smeserver-ezmlm-web/contribs10/smeserver-ezmlm-web-1.1.3-bz11288-sme10.patch
ViewVC logotype

Contents of /rpms/smeserver-ezmlm-web/contribs10/smeserver-ezmlm-web-1.1.3-bz11288-sme10.patch

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


Revision 1.3 - (show annotations) (download)
Sat Mar 19 05:07:17 2022 UTC (2 years, 2 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-ezmlm-web-1_1_3-13_el7_sme, smeserver-ezmlm-web-1_1_3-12_el7_sme, smeserver-ezmlm-web-1_1_3-11_el7_sme, smeserver-ezmlm-web-1_1_3-10_el7_sme, smeserver-ezmlm-web-1_1_3-9_el7_sme, HEAD
Changes since 1.2: +40 -0 lines
* Sat Mar 19 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.1.3-9.sme
- renamed correctly update event [SME: 11288]
  added admin as webuser, owner are default webuser

1 diff -Nur --no-dereference smeserver-ezmlm-web-1.1.3.old/createlinks smeserver-ezmlm-web-1.1.3/createlinks
2 --- smeserver-ezmlm-web-1.1.3.old/createlinks 2022-03-15 14:33:10.330000000 -0400
3 +++ smeserver-ezmlm-web-1.1.3/createlinks 2022-03-15 14:56:23.404000000 -0400
4 @@ -45,5 +45,20 @@
5 mailinglist-update
6 mailinglist-assign
7 ));
8 -
9 +my $event="smeserver-ezmlm-www-update";
10 +templates2events("/etc/ezmlm/ezmlmwebrc",$event);
11 +templates2events("/home/e-smith/files/ezmlm/lists/webusers",$event);
12 +templates2events("/etc/ezmlm/ezmlmwebrc", $event);
13 +templates2events("/etc/httpd/admin-conf/httpd.conf", $event);
14 +templates2events("/etc/httpd/conf/httpd.conf", $event);
15 +templates2events("/home/e-smith/files/ezmlm/lists/webusers", $event);
16 +templates2events("/var/service/qpsmtpd/config/goodrcptto", $event);
17 +safe_symlink("restart","root/etc/e-smith/events/$event/services2adjust/httpd-admin");
18 +safe_symlink("restart","root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
19 +safe_symlink("sighup","root/etc/e-smith/events/$event/services2adjust/qpsmtpd");
20 +safe_symlink("sighup","root/etc/e-smith/events/$event/services2adjust/sqpsmtpd");
21 +safe_symlink("restart","root/etc/e-smith/events/$event/services2adjust/qmail@U");
22 +event_link("ezmlm-update", $event, "60");
23 +templates2events("/var/qmail/users/assign", $event);
24 +safe_symlink("/var/qmail/bin/qmail-newu","root/etc/e-smith/events/$event/S55email-assign");
25
26 diff -Nur --no-dereference smeserver-ezmlm-web-1.1.3.old/createlinks smeserver-ezmlm-web-1.1.3/createlinks
27 --- smeserver-ezmlm-web-1.1.3.old/createlinks 2022-03-19 01:02:18.606000000 -0400
28 +++ smeserver-ezmlm-web-1.1.3/createlinks 2022-03-19 01:03:34.418000000 -0400
29 @@ -45,7 +45,7 @@
30 mailinglist-update
31 mailinglist-assign
32 ));
33 -my $event="smeserver-ezmlm-www-update";
34 +my $event="smeserver-ezmlm-web-update";
35 templates2events("/etc/ezmlm/ezmlmwebrc",$event);
36 templates2events("/home/e-smith/files/ezmlm/lists/webusers",$event);
37 templates2events("/etc/ezmlm/ezmlmwebrc", $event);
38 diff -Nur --no-dereference smeserver-ezmlm-web-1.1.3.old/root/etc/e-smith/web/functions/mailinglists smeserver-ezmlm-web-1.1.3/root/etc/e-smith/web/functions/mailinglists
39 --- smeserver-ezmlm-web-1.1.3.old/root/etc/e-smith/web/functions/mailinglists 2022-03-19 01:02:18.602000000 -0400
40 +++ smeserver-ezmlm-web-1.1.3/root/etc/e-smith/web/functions/mailinglists 2022-03-19 01:04:52.303000000 -0400
41 @@ -280,7 +280,7 @@
42 foreach my $member ( split ( /,/, $members ) ) {
43 $members{$member} = 1;
44 }
45 - my @users = sort { $a->key() cmp $b->key() } $accounts->users();
46 + my @users = sort { $a->key() cmp $b->key() } ( $accounts->users() , $accounts->get('admin') );
47
48
49 my $out = "<tr>\n <td class=\"sme-noborders-label\">"
50 @@ -474,6 +474,7 @@
51
52 my $listOwner = $q->param ('listOwner');
53 $listOwner = "admin" if ($listOwner eq "Administrator");
54 + my @users = sort { $a->key() cmp $b->key() } ( $accounts->users() , $accounts->get('admin') );
55
56 #------------------------------------------------------------
57 # Looks good. Find out if this account has been taken
58 @@ -498,6 +499,7 @@
59 Domain => $listDomain,
60 Description => $listDescription,
61 Owner => $listOwner,
62 + webusers => $webusers,
63 } );
64
65 system ('/sbin/e-smith/signal-event', 'mailinglist-create', $listName) == 0

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