/[smeserver]/rpms/e-smith-pop3/sme8/e-smith-pop3-2.2.0-PopSoftlimit.patch
ViewVC logotype

Annotation of /rpms/e-smith-pop3/sme8/e-smith-pop3-2.2.0-PopSoftlimit.patch

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


Revision 1.2 - (hide annotations) (download)
Fri Jul 6 06:27:57 2012 UTC (12 years, 3 months ago) by wellsi
Branch: MAIN
CVS Tags: e-smith-pop3-2_2_0-7_el5_sme, e-smith-pop3-2_2_0-8_el5_sme, e-smith-pop3-2_2_0-5_el5_sme, e-smith-pop3-2_2_0-6_el5_sme, HEAD
Changes since 1.1: +46 -18 lines
 More robust version of softlimit patch [SME: 6994]

1 wellsi 1.2 diff -ruN e-smith-pop3-2.2.0.old/createlinks e-smith-pop3-2.2.0/createlinks
2     --- e-smith-pop3-2.2.0.old/createlinks 2012-07-06 05:38:19.000000000 +0100
3     +++ e-smith-pop3-2.2.0/createlinks 2012-07-06 06:32:52.000000000 +0100
4     @@ -12,7 +12,11 @@
5     }
6    
7     templates2events("/etc/pam.d/pop3", "console-save");
8     -templates2events("/etc/pam.d/pop3", "bootstrap-console-save");
9     +
10     +foreach my $file (qw(/etc/pam.d/pop3 /var/service/pop3/env/MEMLIMIT /var/service/pop3s/env/MEMLIMIT))
11     +{
12     + templates2events($file, "bootstrap-console-save");
13     +}
14    
15     foreach my $event (qw(network-delete network-create email-update))
16     {
17     diff -ruN e-smith-pop3-2.2.0.old/root/etc/e-smith/templates/var/service/pop3/env/MEMLIMIT e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3/env/MEMLIMIT
18     --- e-smith-pop3-2.2.0.old/root/etc/e-smith/templates/var/service/pop3/env/MEMLIMIT 1970-01-01 01:00:00.000000000 +0100
19     +++ e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3/env/MEMLIMIT 2012-07-06 06:36:53.000000000 +0100
20     @@ -0,0 +1,7 @@
21     +{
22     +# memory limit to catch any memory leak before it kills the system
23     +my $MIN_MEMORY_LIMIT = 40000000;
24     +
25     +# The MIN_MEMORY_LIMIT is returned unless the DB variable is defined and greater than MIN_MEMORY_LIMIT
26     +$OUT = (not defined ($pop3{MemLimit})) || ($pop3{MemLimit} < $MIN_MEMORY_LIMIT) ? $MIN_MEMORY_LIMIT : $pop3{MemLimit};
27     +}
28     diff -ruN e-smith-pop3-2.2.0.old/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT
29     --- e-smith-pop3-2.2.0.old/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT 1970-01-01 01:00:00.000000000 +0100
30     +++ e-smith-pop3-2.2.0/root/etc/e-smith/templates/var/service/pop3s/env/MEMLIMIT 2012-07-06 06:38:21.000000000 +0100
31     @@ -0,0 +1,7 @@
32     +{
33     +# memory limit to catch any memory leak before it kills the system
34     +my $MIN_MEMORY_LIMIT = 40000000;
35     +
36     +# The MIN_MEMORY_LIMIT is returned unless the DB variable is defined and greater than MIN_MEMORY_LIMIT
37     +$OUT = (not defined ($pop3s{MemLimit})) || ($pop3s{MemLimit} < $MIN_MEMORY_LIMIT) ? $MIN_MEMORY_LIMIT : $pop3s{MemLimit};
38     +}
39 wellsi 1.1 diff -ruN e-smith-pop3-2.2.0.old/root/var/service/pop3/run e-smith-pop3-2.2.0/root/var/service/pop3/run
40 wellsi 1.2 --- e-smith-pop3-2.2.0.old/root/var/service/pop3/run 2012-07-06 05:38:19.000000000 +0100
41     +++ e-smith-pop3-2.2.0/root/var/service/pop3/run 2012-07-06 06:32:30.000000000 +0100
42 wellsi 1.1 @@ -3,11 +3,12 @@
43     hostname=$(/sbin/e-smith/config get SystemName)
44     domain=$(/sbin/e-smith/config get DomainName)
45     fqdn="$hostname.$domain"
46 wellsi 1.2 +MEM="`head -1 ./env/MEMLIMIT`"
47 wellsi 1.1
48     exec 2>&1
49     # Generate ACL files in ./peers
50     ./control/1
51     -exec /usr/local/bin/softlimit -m 10000000 \
52 wellsi 1.2 +exec /usr/local/bin/softlimit -m ${MEM} \
53 wellsi 1.1 tcpsvd \
54     -v \
55     -i ./peers \
56     diff -ruN e-smith-pop3-2.2.0.old/root/var/service/pop3s/run e-smith-pop3-2.2.0/root/var/service/pop3s/run
57 wellsi 1.2 --- e-smith-pop3-2.2.0.old/root/var/service/pop3s/run 2012-07-06 05:38:19.000000000 +0100
58     +++ e-smith-pop3-2.2.0/root/var/service/pop3s/run 2012-07-06 06:32:19.000000000 +0100
59 wellsi 1.1 @@ -3,9 +3,10 @@
60     hostname=$(/sbin/e-smith/config get SystemName)
61     domain=$(/sbin/e-smith/config get DomainName)
62     fqdn="$hostname.$domain"
63 wellsi 1.2 +MEM="`head -1 ./env/MEMLIMIT`"
64 wellsi 1.1
65     exec 2>&1
66     -exec /usr/local/bin/softlimit -m 10000000 \
67 wellsi 1.2 +exec /usr/local/bin/softlimit -m ${MEM} \
68 wellsi 1.1 tcpsvd \
69     -v \
70     -i ./peers \

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