| 1 |
diff -Nur smeserver-dovecot-1.6.0.old/createlinks smeserver-dovecot-1.6.0/createlinks |
| 2 |
--- smeserver-dovecot-1.6.0.old/createlinks 2016-02-05 18:43:49.000000000 -0500 |
| 3 |
+++ smeserver-dovecot-1.6.0/createlinks 2020-04-29 22:14:44.343000000 -0400 |
| 4 |
@@ -7,9 +7,9 @@ |
| 5 |
service_link_enhanced("dovecot", "K35", "0"); |
| 6 |
service_link_enhanced("dovecot", "K35", "1"); |
| 7 |
|
| 8 |
-templates2events("/etc/dovecot/dovecot.conf", qw(email-update bootstrap-console-save ssl-update)); |
| 9 |
-templates2events("/etc/dovecot/master.users", qw(email-update bootstrap-console-save)); |
| 10 |
-templates2events("/etc/pam.d/dovecotadmin", qw(email-update bootstrap-console-save)); |
| 11 |
+templates2events("/etc/dovecot/dovecot.conf", qw(email-update bootstrap-console-save ssl-update smeserver-dovecot-update ip-change)); |
| 12 |
+templates2events("/etc/dovecot/master.users", qw(email-update bootstrap-console-save smeserver-dovecot-update)); |
| 13 |
+templates2events("/etc/pam.d/dovecotadmin", qw(email-update bootstrap-console-save smeserver-dovecot-update)); |
| 14 |
|
| 15 |
safe_touch("root/var/service/dovecot/down"); |
| 16 |
safe_symlink("../daemontools" , 'root/etc/rc.d/init.d/supervise/dovecot'); |
| 17 |
@@ -21,3 +21,10 @@ |
| 18 |
event_link("adjust-dovecot", "email-update", "02"); |
| 19 |
event_link("adjust-dovecot", "bootstrap-console-save", "02"); |
| 20 |
|
| 21 |
+#smeserver-dovecot-update |
| 22 |
+safe_symlink("restart", "root/etc/e-smith/events/smeserver-dovecot-update/services2adjust/dovecot"); |
| 23 |
+event_link("adjust-dovecot", "meserver-dovecot-update", "02"); |
| 24 |
+ |
| 25 |
+# in case the ip change |
| 26 |
+safe_symlink("sigusr2", "root/etc/e-smith/events/ip-change/services2adjust/dovecot"); |
| 27 |
+ |
| 28 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3/access smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3/access |
| 29 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3/access 1969-12-31 19:00:00.000000000 -0500 |
| 30 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3/access 2006-03-15 16:34:47.000000000 -0500 |
| 31 |
@@ -0,0 +1 @@ |
| 32 |
+private |
| 33 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3/status smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3/status |
| 34 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3/status 1969-12-31 19:00:00.000000000 -0500 |
| 35 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3/status 2006-03-15 16:34:47.000000000 -0500 |
| 36 |
@@ -0,0 +1 @@ |
| 37 |
+enabled |
| 38 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3/TCPPort smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3/TCPPort |
| 39 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3/TCPPort 1969-12-31 19:00:00.000000000 -0500 |
| 40 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3/TCPPort 2006-03-15 16:34:47.000000000 -0500 |
| 41 |
@@ -0,0 +1 @@ |
| 42 |
+110 |
| 43 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3/type smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3/type |
| 44 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3/type 1969-12-31 19:00:00.000000000 -0500 |
| 45 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3/type 2006-03-15 16:34:47.000000000 -0500 |
| 46 |
@@ -0,0 +1 @@ |
| 47 |
+service |
| 48 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3s/access smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3s/access |
| 49 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3s/access 1969-12-31 19:00:00.000000000 -0500 |
| 50 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3s/access 2006-03-15 16:34:47.000000000 -0500 |
| 51 |
@@ -0,0 +1 @@ |
| 52 |
+private |
| 53 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3s/status smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3s/status |
| 54 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3s/status 1969-12-31 19:00:00.000000000 -0500 |
| 55 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3s/status 2006-03-15 16:34:47.000000000 -0500 |
| 56 |
@@ -0,0 +1 @@ |
| 57 |
+enabled |
| 58 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3s/TCPPort smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3s/TCPPort |
| 59 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3s/TCPPort 1969-12-31 19:00:00.000000000 -0500 |
| 60 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3s/TCPPort 2006-03-15 16:34:47.000000000 -0500 |
| 61 |
@@ -0,0 +1 @@ |
| 62 |
+995 |
| 63 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3s/type smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3s/type |
| 64 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/defaults/pop3s/type 1969-12-31 19:00:00.000000000 -0500 |
| 65 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/defaults/pop3s/type 2006-03-15 16:34:47.000000000 -0500 |
| 66 |
@@ -0,0 +1 @@ |
| 67 |
+service |
| 68 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/migrate/PopMemLimit smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/migrate/PopMemLimit |
| 69 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/db/configuration/migrate/PopMemLimit 1969-12-31 19:00:00.000000000 -0500 |
| 70 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/db/configuration/migrate/PopMemLimit 2020-04-29 22:41:55.583000000 -0400 |
| 71 |
@@ -0,0 +1,23 @@ |
| 72 |
+{ |
| 73 |
+ |
| 74 |
+# This limit is renamed after ProcessMemoryLimit for consistency with imap entry |
| 75 |
+foreach my $prop (qw/MemLimit/){ |
| 76 |
+ my $pop_value = $DB->get_prop_and_delete('pop3', $prop); |
| 77 |
+ next unless ($pop_value); |
| 78 |
+ my $curpop_value = $DB->get_prop('pop3', 'ProcessMemoryLimit'); |
| 79 |
+ next if ($curpop_value); |
| 80 |
+ $DB->set_prop('pop3', 'ProcessMemoryLimit', $pop_value); |
| 81 |
+} |
| 82 |
+ |
| 83 |
+# Those limits are now defined on the pop entry |
| 84 |
+foreach my $prop (qw/MemLimit/){ |
| 85 |
+ my $pops_value = $DB->get_prop_and_delete('pop3s', $prop); |
| 86 |
+ next unless ($pops_value); |
| 87 |
+ my $pop_value = $DB->get_prop('pop3', 'ProcessMemoryLimit'); |
| 88 |
+ next if ($pop_value); |
| 89 |
+ $DB->set_prop('pop3', 'ProcessMemoryLimit' , $imaps_value); |
| 90 |
+} |
| 91 |
+ |
| 92 |
+ |
| 93 |
+} |
| 94 |
+ |
| 95 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/events/actions/adjust-dovecot smeserver-dovecot-1.6.0/root/etc/e-smith/events/actions/adjust-dovecot |
| 96 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/events/actions/adjust-dovecot 2013-02-26 12:57:10.000000000 -0500 |
| 97 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/events/actions/adjust-dovecot 2020-04-29 21:42:48.139000000 -0400 |
| 98 |
@@ -3,8 +3,8 @@ |
| 99 |
|
| 100 |
# This script just ensure the dovecot service is enabled |
| 101 |
# if imap or imaps is enabled |
| 102 |
-# It will also entirely disable the dovecot service if both imap |
| 103 |
-# and imaps are disabled |
| 104 |
+# It will also entirely disable the dovecot service if both imap, |
| 105 |
+# imaps pop3 and pop3s are disabled |
| 106 |
|
| 107 |
use esmith::ConfigDB; |
| 108 |
|
| 109 |
@@ -12,17 +12,23 @@ |
| 110 |
|
| 111 |
my $imap = $c->get('imap'); |
| 112 |
my $imaps = $c->get('imaps'); |
| 113 |
+my $pop = $c->get('pop3'); |
| 114 |
+my $pops = $c->get('pop3s'); |
| 115 |
my $dovecot = $c->get('dovecot') || $c->new_record('dovecot', |
| 116 |
{ type => 'service', |
| 117 |
status => 'enabled'}); |
| 118 |
|
| 119 |
my $imapStatus = $imap->prop('status') || 'enabled'; |
| 120 |
my $imapsStatus = $imaps->prop('status') || 'enabled'; |
| 121 |
+my $popStatus = $pop->prop('status') || 'enabled'; |
| 122 |
+my $popsStatus = $pops->prop('status') || 'enabled'; |
| 123 |
|
| 124 |
-if ($imapStatus eq 'enabled' or $imapsStatus eq 'enabled'){ |
| 125 |
+if ($imapStatus eq 'enabled' or $imapsStatus eq 'enabled' or $popStatus eq 'enabled' or $popsStatus eq 'enabled'){ |
| 126 |
$dovecot->set_prop('status', 'enabled'); |
| 127 |
} |
| 128 |
else{ |
| 129 |
$dovecot->set_prop('status', 'disabled'); |
| 130 |
} |
| 131 |
|
| 132 |
+# also if /etc/pam.d/pop3 exists we unlink it, as it was needed by former e-smith-pop3 |
| 133 |
+unlink('/etc/pam.d/pop3'); |
| 134 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/10protocols10Pop smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/10protocols10Pop |
| 135 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/10protocols10Pop 1969-12-31 19:00:00.000000000 -0500 |
| 136 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/10protocols10Pop 2020-04-29 16:47:53.571000000 -0400 |
| 137 |
@@ -0,0 +1,8 @@ |
| 138 |
+{ |
| 139 |
+if ((($pop3{'status'} || 'disabled') eq 'enabled') || |
| 140 |
+(($pop3s{'status'} || 'disabled') eq 'enabled')) { |
| 141 |
+ $proto .= " pop3"; |
| 142 |
+ } |
| 143 |
+ |
| 144 |
+$OUT .= ""; |
| 145 |
+} |
| 146 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/15auth smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/15auth |
| 147 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/15auth 2016-02-05 18:43:49.000000000 -0500 |
| 148 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/15auth 2020-04-26 16:14:34.424000000 -0400 |
| 149 |
@@ -1,6 +1,4 @@ |
| 150 |
{ |
| 151 |
-my $greeting = $dovecot{'Greeting'} || 'SME Server IMAP service powered by doveot'; |
| 152 |
-$OUT .= "login_greeting = \"$greeting\"\n"; |
| 153 |
our $args = $dovecot{PassDBArgs} || ''; |
| 154 |
} |
| 155 |
passdb \{ |
| 156 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/27Limits smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/27Limits |
| 157 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/27Limits 2016-02-05 18:43:48.000000000 -0500 |
| 158 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/27Limits 2020-04-26 16:35:23.507000000 -0400 |
| 159 |
@@ -4,13 +4,17 @@ |
| 160 |
my $ConcurrencyLimitPerIP = $imap{ConcurrencyLimitPerIP} || '12'; |
| 161 |
my $ProcessMemoryLimit = $imap{ProcessMemoryLimit} || '256000000'; |
| 162 |
|
| 163 |
+my $greeting = $imap{'Greeting'} || $dovecot{'Greeting'} || 'SME Server IMAP service powered by dovecot'; |
| 164 |
+ |
| 165 |
$OUT .=<<"END"; |
| 166 |
|
| 167 |
service imap { |
| 168 |
process_limit = $ConcurrencyLimit |
| 169 |
vsz_limit = $ProcessMemoryLimit |
| 170 |
+ client_limit = 1 |
| 171 |
} |
| 172 |
protocol imap { |
| 173 |
+ login_greeting = $greeting |
| 174 |
mail_max_userip_connections = $ConcurrencyLimitPerIP |
| 175 |
} |
| 176 |
END |
| 177 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/28LimitsPop3 smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/28LimitsPop3 |
| 178 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/28LimitsPop3 1969-12-31 19:00:00.000000000 -0500 |
| 179 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/28LimitsPop3 2020-04-29 22:42:35.586000000 -0400 |
| 180 |
@@ -0,0 +1,23 @@ |
| 181 |
+{ |
| 182 |
+ |
| 183 |
+my $ConcurrencyLimit = $pop3{ConcurrencyLimit} || '40'; |
| 184 |
+my $ConcurrencyLimitPerIP = $pop3{ConcurrencyLimitPerIP} || '4'; |
| 185 |
+my $ProcessMemoryLimit = $pop3{ProcessMemoryLimit} || '40000000'; |
| 186 |
+ |
| 187 |
+my $greeting = $pop3{'Greeting'} || $dovecot{'Greeting'} || 'SME Server POP3 service powered by dovecot'; |
| 188 |
+ |
| 189 |
+$OUT .=<<"END"; |
| 190 |
+ |
| 191 |
+service pop3 { |
| 192 |
+ process_limit = $ConcurrencyLimit |
| 193 |
+ vsz_limit = $ProcessMemoryLimit |
| 194 |
+ client_limit = 1 |
| 195 |
+} |
| 196 |
+protocol pop3 { |
| 197 |
+ mail_max_userip_connections = $ConcurrencyLimitPerIP |
| 198 |
+ login_greeting = $greeting |
| 199 |
+} |
| 200 |
+END |
| 201 |
+ |
| 202 |
+} |
| 203 |
+ |
| 204 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/30listener smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/30listener |
| 205 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/30listener 2016-02-05 18:43:48.000000000 -0500 |
| 206 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/30listener 2020-04-29 22:30:05.085000000 -0400 |
| 207 |
@@ -1,4 +1,5 @@ |
| 208 |
{ |
| 209 |
+# (($imap{'status'} || 'disabled') eq 'disabled') to remove if we use for pop3, to test |
| 210 |
if ((($imap{'status'} || 'disabled') eq 'disabled') || |
| 211 |
(($imap{'AllowPlainText'} || 'enabled') eq 'disabled')){ |
| 212 |
$OUT .= "disable_plaintext_auth = yes\n"; |
| 213 |
@@ -8,19 +9,58 @@ |
| 214 |
} |
| 215 |
} |
| 216 |
|
| 217 |
-service imap-login \{ |
| 218 |
+{ |
| 219 |
+# TODO IPV6 :: |
| 220 |
+$LOCALIP = $LocalIP; |
| 221 |
+$EXTERNALIP = $ExternalIP || ""; |
| 222 |
+$imapPort = $imap{'TCPPort'} || '110'; |
| 223 |
+$imapsPort = $imaps{'TCPPort'} || '995'; |
| 224 |
+$imapStatus = $imap{'status'} || 'disabled'; |
| 225 |
+$imapsStatus = $imaps{'status'} || 'disabled'; |
| 226 |
+$imapAccess = $imap{'access'} || 'localhost'; |
| 227 |
+$imapsAccess = $imaps{'access'} || 'private'; |
| 228 |
+$imapListenIP = $imap{'ListenIP'} || ''; |
| 229 |
+$imapsListenIP = $imaps{'ListenIP'} || ''; |
| 230 |
+ |
| 231 |
+if ($imapStatus eq 'disabled') { |
| 232 |
+ $imapAddress = '127.0.0.1'; |
| 233 |
+ $imapPort='0'; |
| 234 |
+} elsif ($imapAccess eq 'localhost') { |
| 235 |
+ $imapAddress = '127.0.0.1'; |
| 236 |
+} elsif ($imapAccess eq 'private') { |
| 237 |
+ $imapAddress = "127.0.0.1 $LOCALIP"; |
| 238 |
+} elsif ($imapAccess eq 'public') { |
| 239 |
+ $imapAddress = "127.0.0.1 $LOCALIP $EXTERNALIP"; |
| 240 |
+} |
| 241 |
+$imapAddress .= " $imapListenIP"; |
| 242 |
+ |
| 243 |
+ |
| 244 |
+if ($imapsStatus eq 'disabled') { |
| 245 |
+ $imapsAddress = '127.0.0.1'; |
| 246 |
+ $imapsPort='0'; |
| 247 |
+} elsif ($imapsAccess eq 'localhost') { |
| 248 |
+ $imapsAddress = '127.0.0.1'; |
| 249 |
+} elsif ($imapsAccess eq 'private') { |
| 250 |
+ $imapsAddress = "127.0.0.1 $LOCALIP"; |
| 251 |
+} elsif ($imapsAccess eq 'public') { |
| 252 |
+ $imapsAddress = "127.0.0.1 $LOCALIP $EXTERNALIP"; |
| 253 |
+} |
| 254 |
+$imapsAddress .= " $imapsListenIP"; |
| 255 |
+ |
| 256 |
+$OUT .= "service imap-login \{ |
| 257 |
inet_listener imap \{ |
| 258 |
- port = {$imap{'TCPPort'} || '143'} |
| 259 |
- address = { ($imap{'access'} || 'private') eq 'localhost' ? '127.0.0.1':'*' } |
| 260 |
+ port = $imapPort |
| 261 |
+ address = $imapAddress |
| 262 |
\} |
| 263 |
inet_listener imaps \{ |
| 264 |
- port = {$imaps{'TCPPort'} || '993'} |
| 265 |
+ port = $imapsPort |
| 266 |
ssl = yes |
| 267 |
- address = * |
| 268 |
+ address = $imapsAddress |
| 269 |
\} |
| 270 |
|
| 271 |
service_count = 0 |
| 272 |
process_min_avail = 2 |
| 273 |
|
| 274 |
-\} |
| 275 |
+\}"; |
| 276 |
|
| 277 |
+} |
| 278 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/31listenerPop3 smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/31listenerPop3 |
| 279 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/31listenerPop3 1969-12-31 19:00:00.000000000 -0500 |
| 280 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/31listenerPop3 2020-04-29 22:07:56.325000000 -0400 |
| 281 |
@@ -0,0 +1,54 @@ |
| 282 |
+{ |
| 283 |
+# TODO IPV6 :: |
| 284 |
+$LOCALIP = $LocalIP; |
| 285 |
+$EXTERNALIP = $ExternalIP || ""; |
| 286 |
+$popPort = $pop3{'TCPPort'} || '110'; |
| 287 |
+$popsPort = $pop3s{'TCPPort'} || '995'; |
| 288 |
+$popStatus = $pop3{'status'} || 'disabled'; |
| 289 |
+$popsStatus = $pop3s{'status'} || 'disabled'; |
| 290 |
+$popAccess = $pop3{'access'} || 'localhost'; |
| 291 |
+$popsAccess = $pop3s{'access'} || 'private'; |
| 292 |
+$popListenIP = $pop3{'ListenIP'} || ''; |
| 293 |
+$popsListenIP = $pop3s{'ListenIP'} || ''; |
| 294 |
+if ($popStatus eq 'disabled') { |
| 295 |
+ $popAddress = '127.0.0.1'; |
| 296 |
+ $popPort='0'; |
| 297 |
+} elsif ($popAccess eq 'localhost') { |
| 298 |
+ $popAddress = '127.0.0.1'; |
| 299 |
+} elsif ($popAccess eq 'private') { |
| 300 |
+ $popAddress = "127.0.0.1 $LOCALIP"; |
| 301 |
+} elsif ($popAccess eq 'public') { |
| 302 |
+ $popAddress = "127.0.0.1 $LOCALIP $EXTERNALIP"; |
| 303 |
+} |
| 304 |
+$popAddress .= " $popListenIP"; |
| 305 |
+ |
| 306 |
+ |
| 307 |
+if ($popsStatus eq 'disabled') { |
| 308 |
+ $popsAddress = '127.0.0.1'; |
| 309 |
+ $popsPort='0'; |
| 310 |
+} elsif ($popsAccess eq 'localhost') { |
| 311 |
+ $popsAddress = '127.0.0.1'; |
| 312 |
+} elsif ($popsAccess eq 'private') { |
| 313 |
+ $popsAddress = "127.0.0.1 $LOCALIP"; |
| 314 |
+} elsif ($popsAccess eq 'public') { |
| 315 |
+ $popsAddress = "127.0.0.1 $LOCALIP $EXTERNALIP"; |
| 316 |
+} |
| 317 |
+$popsAddress .= " $popsListenIP"; |
| 318 |
+ |
| 319 |
+$OUT .= "service pop3-login \{ |
| 320 |
+ inet_listener pop3 \{ |
| 321 |
+ port = $popPort |
| 322 |
+ address = $popAddress |
| 323 |
+ \} |
| 324 |
+ inet_listener pop3s \{ |
| 325 |
+ port = $popsPort |
| 326 |
+ ssl = yes |
| 327 |
+ address = $popsAddress |
| 328 |
+ \} |
| 329 |
+ |
| 330 |
+ service_count = 0 |
| 331 |
+ process_min_avail = 2 |
| 332 |
+ |
| 333 |
+\}" |
| 334 |
+} |
| 335 |
+ |
| 336 |
diff -Nur smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/35ssl smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/35ssl |
| 337 |
--- smeserver-dovecot-1.6.0.old/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/35ssl 2020-04-26 11:39:44.350000000 -0400 |
| 338 |
+++ smeserver-dovecot-1.6.0/root/etc/e-smith/templates/etc/dovecot/dovecot.conf/35ssl 2020-04-29 21:03:27.917000000 -0400 |
| 339 |
@@ -1,4 +1,4 @@ |
| 340 |
-ssl = {$OUT .= (($imaps{'status'} || 'enabled') eq 'enabled') ? 'yes':'no';} |
| 341 |
+ssl = {$OUT .= ( (($imaps{'status'} || 'enabled') eq 'enabled') || (($pops{'status'} || 'enabled') eq 'enabled') ) ? 'yes':'no';} |
| 342 |
ssl_cert = </var/service/dovecot/ssl/imapd.pem |
| 343 |
ssl_key = </var/service/dovecot/ssl/imapd.pem |
| 344 |
{ |
Parent Directory
| 
Revision Log
| 
Revision Graph
