1 |
vip-ire |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication |
2 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication 1970-01-01 01:00:00.000000000 +0100 |
3 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Authentication 2016-04-22 17:36:53.020247688 +0200 |
4 |
|
|
@@ -0,0 +1 @@ |
5 |
|
|
+enabled |
6 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Instances mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Instances |
7 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Instances 1970-01-01 01:00:00.000000000 +0100 |
8 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Instances 2016-04-22 17:36:53.020247688 +0200 |
9 |
|
|
@@ -0,0 +1 @@ |
10 |
|
|
+40 |
11 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/InstancesPerIP mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/InstancesPerIP |
12 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/InstancesPerIP 1970-01-01 01:00:00.000000000 +0100 |
13 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/InstancesPerIP 2016-04-22 17:36:53.020247688 +0200 |
14 |
|
|
@@ -0,0 +1 @@ |
15 |
|
|
+5 |
16 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/PatternsScan mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/PatternsScan |
17 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/PatternsScan 1970-01-01 01:00:00.000000000 +0100 |
18 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/PatternsScan 2016-04-22 17:36:53.020247688 +0200 |
19 |
|
|
@@ -0,0 +1 @@ |
20 |
|
|
+disabled |
21 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Proxy mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Proxy |
22 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Proxy 1970-01-01 01:00:00.000000000 +0100 |
23 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/Proxy 2016-04-22 17:36:53.020247688 +0200 |
24 |
|
|
@@ -0,0 +1 @@ |
25 |
|
|
+blocked |
26 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPPort mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPPort |
27 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPPort 1970-01-01 01:00:00.000000000 +0100 |
28 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPPort 2016-04-22 17:36:55.188247486 +0200 |
29 |
|
|
@@ -0,0 +1 @@ |
30 |
|
|
+25 |
31 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPProxyPort mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPProxyPort |
32 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPProxyPort 1970-01-01 01:00:00.000000000 +0100 |
33 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/TCPProxyPort 2016-04-22 17:36:55.188247486 +0200 |
34 |
|
|
@@ -0,0 +1 @@ |
35 |
|
|
+25 |
36 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/VirusScan mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/VirusScan |
37 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/VirusScan 1970-01-01 01:00:00.000000000 +0100 |
38 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/qpsmtpd/VirusScan 2016-04-22 17:36:56.449247369 +0200 |
39 |
|
|
@@ -0,0 +1 @@ |
40 |
|
|
+enabled |
41 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/MaximumDateOffset mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/MaximumDateOffset |
42 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/MaximumDateOffset 2005-08-19 23:31:02.000000000 +0200 |
43 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/MaximumDateOffset 1970-01-01 01:00:00.000000000 +0100 |
44 |
|
|
@@ -1 +0,0 @@ |
45 |
|
|
-0 |
46 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/tnef2mime mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/tnef2mime |
47 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/tnef2mime 2005-08-19 23:31:02.000000000 +0200 |
48 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/smtpd/tnef2mime 1970-01-01 01:00:00.000000000 +0100 |
49 |
|
|
@@ -1 +0,0 @@ |
50 |
|
|
-enabled |
51 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Authentication mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Authentication |
52 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Authentication 1970-01-01 01:00:00.000000000 +0100 |
53 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Authentication 2016-04-22 17:37:17.042245462 +0200 |
54 |
|
|
@@ -0,0 +1 @@ |
55 |
|
|
+enabled |
56 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Instances mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Instances |
57 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Instances 1970-01-01 01:00:00.000000000 +0100 |
58 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/Instances 2016-04-22 17:37:17.042245462 +0200 |
59 |
|
|
@@ -0,0 +1 @@ |
60 |
|
|
+10 |
61 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/TCPPort mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/TCPPort |
62 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/TCPPort 1970-01-01 01:00:00.000000000 +0100 |
63 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/defaults/sqpsmtpd/TCPPort 2016-04-22 17:37:17.442245422 +0200 |
64 |
|
|
@@ -0,0 +1 @@ |
65 |
|
|
+465 |
66 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/migrate/80Qpsmtpd mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/migrate/80Qpsmtpd |
67 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/migrate/80Qpsmtpd 1970-01-01 01:00:00.000000000 +0100 |
68 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/db/configuration/migrate/80Qpsmtpd 2016-04-22 19:12:11.467465954 +0200 |
69 |
|
|
@@ -0,0 +1,19 @@ |
70 |
|
|
+{ |
71 |
|
|
+ my $smtpd = $DB->get("smtpd"); |
72 |
|
|
+ if ($smtpd){ |
73 |
|
|
+ my $qpsmtpd = $DB->get("qpsmtpd") || |
74 |
|
|
+ $DB->new_record("qpsmtpd", { type => "service" }); |
75 |
|
|
+ |
76 |
|
|
+ $qpsmtpd->merge_props($smtpd->props); |
77 |
|
|
+ $smtpd->delete; |
78 |
|
|
+ } |
79 |
|
|
+ |
80 |
|
|
+ my $ssmtpd = $DB->get("ssmtpd"); |
81 |
|
|
+ if ($ssmtpd){ |
82 |
|
|
+ my $sqpsmtpd = $DB->get("sqpsmtpd") || |
83 |
|
|
+ $DB->new_record("sqpsmtpd", { type => "service" }); |
84 |
|
|
+ |
85 |
|
|
+ $sqpsmtpd->merge_props($ssmtpd->props); |
86 |
|
|
+ $ssmtpd->delete; |
87 |
|
|
+ } |
88 |
|
|
+} |
89 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/05auth_cvm_unix_local mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/05auth_cvm_unix_local |
90 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/05auth_cvm_unix_local 2005-08-19 23:31:01.000000000 +0200 |
91 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/05auth_cvm_unix_local 2016-04-22 17:44:12.515207939 +0200 |
92 |
|
|
@@ -1,6 +1,6 @@ |
93 |
|
|
{ |
94 |
|
|
- my $auth_smtp = ($smtpd{Authentication} eq 'enabled') ? 'yes' : 'no'; |
95 |
|
|
- my $auth_ssmtp = ($ssmtpd{Authentication} eq 'enabled') ? 'yes' : 'no'; |
96 |
|
|
+ my $auth_smtp = ($qpsmtpd{Authentication} eq 'enabled') ? 'yes' : 'no'; |
97 |
|
|
+ my $auth_ssmtp = ($sqpsmtpd{Authentication} eq 'enabled') ? 'yes' : 'no'; |
98 |
|
|
|
99 |
|
|
$OUT = "auth/auth_cvm_unix_local"; |
100 |
|
|
$OUT .= " cvm_socket /var/lib/cvm/cvm-unix-local.socket"; |
101 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17headers mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17headers |
102 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17headers 2016-04-22 23:03:14.196638643 +0200 |
103 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/17headers 2016-04-22 18:27:30.981905475 +0200 |
104 |
|
|
@@ -2,7 +2,7 @@ |
105 |
|
|
$OUT = "headers"; |
106 |
|
|
|
107 |
|
|
# Note: You can't specify a maximum offset of 0 days, but that's fair |
108 |
|
|
- my $days = $smtpd{MaximumDateOffset} || ''; |
109 |
|
|
+ my $days = $qpsmtpd{MaximumDateOffset} || ''; |
110 |
|
|
|
111 |
|
|
$OUT .= " future $days past $days" if ($days); |
112 |
|
|
} |
113 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62pattern_filter mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62pattern_filter |
114 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62pattern_filter 2005-08-19 23:31:01.000000000 +0200 |
115 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62pattern_filter 2016-04-22 18:28:27.155898934 +0200 |
116 |
|
|
@@ -1,6 +1,6 @@ |
117 |
|
|
{ |
118 |
|
|
return "# pattern_filter disabled" |
119 |
|
|
- unless ($smtpd{PatternsScan} eq "enabled"); |
120 |
|
|
+ unless ($qpsmtpd{PatternsScan} eq "enabled"); |
121 |
|
|
|
122 |
|
|
return "virus/pattern_filter check=patterns action=deny"; |
123 |
|
|
} |
124 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62tnef2mime mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62tnef2mime |
125 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62tnef2mime 2008-10-07 17:05:17.000000000 +0200 |
126 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/62tnef2mime 2016-04-22 18:28:05.263901477 +0200 |
127 |
|
|
@@ -1,6 +1,6 @@ |
128 |
|
|
{ |
129 |
|
|
return "# tnef to mime conversion disabled" |
130 |
|
|
- unless ($smtpd{tnef2mime} eq "enabled"); |
131 |
|
|
+ unless ($qpsmtpd{tnef2mime} eq "enabled"); |
132 |
|
|
return "tnef2mime"; |
133 |
|
|
} |
134 |
|
|
|
135 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/65disclaimer mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/65disclaimer |
136 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/65disclaimer 2008-10-07 17:05:18.000000000 +0200 |
137 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/65disclaimer 2016-04-22 18:28:16.170900207 +0200 |
138 |
|
|
@@ -1,6 +1,6 @@ |
139 |
|
|
{ |
140 |
|
|
return "# disclaimer disabled" |
141 |
|
|
- unless ($smtpd{disclaimer} || 'disabled') eq "enabled"; |
142 |
|
|
+ unless ($qpsmtpd{disclaimer} || 'disabled') eq "enabled"; |
143 |
|
|
return "disclaimer"; |
144 |
|
|
} |
145 |
|
|
|
146 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/80clamav mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/80clamav |
147 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/80clamav 2016-04-22 23:03:14.209638646 +0200 |
148 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/plugins/80clamav 2016-04-22 18:27:56.581902487 +0200 |
149 |
|
|
@@ -3,7 +3,7 @@ |
150 |
|
|
|
151 |
|
|
my $s = $clamd{status} || 'disabled'; |
152 |
|
|
return "# clamd disabled" unless ($s eq "enabled"); |
153 |
|
|
- $s = $smtpd{VirusScan} || 'disabled'; |
154 |
|
|
+ $s = $qpsmtpd{VirusScan} || 'disabled'; |
155 |
|
|
return "# clamav disabled" unless ($s eq "enabled"); |
156 |
|
|
|
157 |
|
|
my $max_size = $qpsmtpd{MaxScannerSize} || |
158 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES |
159 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES 2005-08-19 23:31:01.000000000 +0200 |
160 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES 2016-04-22 17:15:33.881351910 +0200 |
161 |
|
|
@@ -1,3 +1,3 @@ |
162 |
|
|
{ |
163 |
|
|
- return "INSTANCES=" . ($smtpd{Instances} || "40"); |
164 |
|
|
+ return "INSTANCES=" . ($qpsmtpd{Instances} || "40"); |
165 |
|
|
} |
166 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES_PER_IP mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES_PER_IP |
167 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES_PER_IP 2005-08-19 23:31:01.000000000 +0200 |
168 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/INSTANCES_PER_IP 2016-04-22 17:15:45.195351728 +0200 |
169 |
|
|
@@ -1,3 +1,3 @@ |
170 |
|
|
{ |
171 |
|
|
- return "INSTANCES_PER_IP=" . ($smtpd{InstancesPerIP} || "5"); |
172 |
|
|
+ return "INSTANCES_PER_IP=" . ($qpsmtpd{InstancesPerIP} || "5"); |
173 |
|
|
} |
174 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/PORT mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/PORT |
175 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/PORT 2005-08-19 23:31:01.000000000 +0200 |
176 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/runenv/PORT 2016-04-22 17:15:23.645352072 +0200 |
177 |
|
|
@@ -1,3 +1,3 @@ |
178 |
|
|
{ |
179 |
|
|
- return "export PORT=" . ($smtpd{TCPPort} || "25"); |
180 |
|
|
+ return "export PORT=" . ($qpsmtpd{TCPPort} || "25"); |
181 |
|
|
} |
182 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES |
183 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES 2005-08-19 23:31:01.000000000 +0200 |
184 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES 2016-04-22 17:16:27.733351057 +0200 |
185 |
|
|
@@ -1,3 +1,3 @@ |
186 |
|
|
{ |
187 |
|
|
- return "INSTANCES=" . ($ssmtpd{Instances} || $smtpd{Instances} || "10"); |
188 |
|
|
+ return "INSTANCES=" . ($sqpsmtpd{Instances} || $qpsmtpd{Instances} || "10"); |
189 |
|
|
} |
190 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES_PER_IP mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES_PER_IP |
191 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES_PER_IP 2005-08-19 23:31:01.000000000 +0200 |
192 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/INSTANCES_PER_IP 2016-04-22 17:16:38.748350883 +0200 |
193 |
|
|
@@ -1,4 +1,4 @@ |
194 |
|
|
{ |
195 |
|
|
return "INSTANCES_PER_IP=" . |
196 |
|
|
- ($ssmtpd{InstancesPerIP} || $smtpd{InstancesPerIP} || "5"); |
197 |
|
|
+ ($sqpsmtpd{InstancesPerIP} || $qpsmtpd{InstancesPerIP} || "5"); |
198 |
|
|
} |
199 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/PORT mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/PORT |
200 |
|
|
--- smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/PORT 2005-08-19 23:31:01.000000000 +0200 |
201 |
|
|
+++ mezzanine_patched_smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/sqpsmtpd/runenv/PORT 2016-04-22 23:02:26.784627513 +0200 |
202 |
|
|
@@ -1,3 +1,3 @@ |
203 |
|
|
{ |
204 |
|
|
- return "export PORT=" . (${ssmtpd}{TCPPort} || "465"); |
205 |
|
|
+ return "export PORT=" . (${sqpsmtpd}{TCPPort} || "465"); |
206 |
|
|
} |
207 |
unnilennium |
1.2 |
diff -Nur smeserver-qpsmtpd-2.6.0.old/root/etc/e-smith/templates/var/service/qpsmtpd/config/smtpgreeting/10Body smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/smtpgreeting/10Body |
208 |
|
|
--- smeserver-qpsmtpd-2.6.0.old/root/etc/e-smith/templates/var/service/qpsmtpd/config/smtpgreeting/10Body 2006-06-30 19:08:07.000000000 -0400 |
209 |
|
|
+++ smeserver-qpsmtpd-2.6.0/root/etc/e-smith/templates/var/service/qpsmtpd/config/smtpgreeting/10Body 2017-04-12 17:28:54.579000000 -0400 |
210 |
|
|
@@ -1,3 +1,3 @@ |
211 |
|
|
{ |
212 |
|
|
- $smtpd{Greeting} || "$SystemName.$DomainName"; |
213 |
|
|
+ $qpsmtpd{Greeting} || "$SystemName.$DomainName"; |
214 |
|
|
} |