1 |
diff -Nur e-smith-base-5.2.0/root/etc/e-smith/events/actions/group-create-unix e-smith-base-5.2.0-apache_vs_www/root/etc/e-smith/events/actions/group-create-unix |
2 |
--- e-smith-base-5.2.0/root/etc/e-smith/events/actions/group-create-unix 2013-06-14 08:50:49.742759238 +0200 |
3 |
+++ e-smith-base-5.2.0-apache_vs_www/root/etc/e-smith/events/actions/group-create-unix 2013-06-14 08:58:16.805767551 +0200 |
4 |
@@ -167,6 +167,8 @@ |
5 |
|
6 |
my @groupList = split (/\s+/, $groups); |
7 |
@groupList = grep (!/^$member$/, @groupList); |
8 |
+ # Apache is an alias for www |
9 |
+ @groupList= map { $_ =~ s/^apache$/www/g; $_ } @groupList; |
10 |
|
11 |
push @groupList, $groupName; |
12 |
|
13 |
diff -Nur e-smith-base-5.2.0/root/etc/e-smith/events/actions/group-modify-unix e-smith-base-5.2.0-apache_vs_www/root/etc/e-smith/events/actions/group-modify-unix |
14 |
--- e-smith-base-5.2.0/root/etc/e-smith/events/actions/group-modify-unix 2013-06-14 08:50:49.742759238 +0200 |
15 |
+++ e-smith-base-5.2.0-apache_vs_www/root/etc/e-smith/events/actions/group-modify-unix 2013-06-14 08:59:12.251000367 +0200 |
16 |
@@ -138,6 +138,8 @@ |
17 |
|
18 |
my @groupList = split (/\s+/, $groups); |
19 |
@groupList = grep (!/^$member$/, @groupList); |
20 |
+ # Apache is an alias for www |
21 |
+ @groupList= map { $_ =~ s/^apache$/www/g; $_ } @groupList; |
22 |
|
23 |
if ($oldMembers{$member}) |
24 |
{ |
25 |
diff -Nur e-smith-base-5.2.0/root/etc/e-smith/events/actions/init-accounts e-smith-base-5.2.0-apache_vs_www/root/etc/e-smith/events/actions/init-accounts |
26 |
--- e-smith-base-5.2.0/root/etc/e-smith/events/actions/init-accounts 2013-06-14 08:50:49.742759238 +0200 |
27 |
+++ e-smith-base-5.2.0-apache_vs_www/root/etc/e-smith/events/actions/init-accounts 2013-06-14 09:19:15.858585579 +0200 |
28 |
@@ -89,7 +89,7 @@ |
29 |
@groupList = grep (!/^admin$/, @groupList); |
30 |
@groupList = grep (!/^root$/, @groupList); |
31 |
@groupList = grep (!/^shared$/, @groupList); |
32 |
- @groupList = grep (!/^www$/, @groupList); |
33 |
+ @groupList = grep (!/^(www|apache)$/, @groupList); |
34 |
|
35 |
push @groupList, 'shared', 'www'; |
36 |
|
37 |
@@ -164,7 +164,7 @@ |
38 |
# are listed exactly once each. |
39 |
#-------------------------------------------------- |
40 |
|
41 |
- @groupList = grep (!/^www$/, @groupList); |
42 |
+ @groupList = grep (!/^(www|apache)$/, @groupList); |
43 |
@groupList = grep (!/^shared$/, @groupList); |
44 |
|
45 |
push @groupList, 'shared'; |