smeserver/smeserver-dovecot
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Wed Sep 11 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme

Browse Source 
- merge dovecot-extra [SME: 12735]
- add sieves support over ssl and improve template
This commit is contained in:
Jean-Philippe Pialasse
2024-09-12 00:36:59 -04:00
parent f1f6daf9e3
commit 904b1a448d
12 changed files with 65 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
root/etc/e-smith/db/configuration/defaults/sieve/access
View File

@@ -1 +1 @@
private
localhost

2
root/etc/e-smith/db/configuration/defaults/sieve/type
View File

@@ -1 +1 @@
service
configuration

1
root/etc/e-smith/db/configuration/defaults/sieves/TCPPort Normal file
View File

@@ -0,0 +1 @@
5190

1
root/etc/e-smith/db/configuration/defaults/sieves/access Normal file
View File

@@ -0,0 +1 @@
private

1
root/etc/e-smith/db/configuration/defaults/sieves/sieve/TCPPort Normal file
View File

@@ -0,0 +1 @@
4190

1
root/etc/e-smith/db/configuration/defaults/sieves/sieve/access Normal file
View File

@@ -0,0 +1 @@
private

1
root/etc/e-smith/db/configuration/defaults/sieves/sieve/status Normal file
View File

@@ -0,0 +1 @@
enabled

1
root/etc/e-smith/db/configuration/defaults/sieves/sieve/type Normal file
View File

@@ -0,0 +1 @@
configuration

1
root/etc/e-smith/db/configuration/defaults/sieves/status Normal file
View File

@@ -0,0 +1 @@
enabled

1
root/etc/e-smith/db/configuration/defaults/sieves/type Normal file
View File

@@ -0,0 +1 @@
service

57
root/etc/e-smith/templates/etc/dovecot/dovecot.conf/30listener11sieve
View File

@@ -1,17 +1,64 @@
{
if (($sieve{'status'} || 'enabled') eq 'enabled'){
my $port = $sieve{'TCPPort'} || '4190';
my $address = $sieve{'Listen'} || '127.0.0.1';
$OUT .=<<"HERE";
my $sieveStatus = $sieve{'status'} || 'enabled';
my $sievesStatus = $sieves{'status'} || 'enabled';
my $port = $sieve{'TCPPort'} || '4190';
# should we only allow localhost ?
my $sieveAccess = $sieve{'access'} || 'localhost';
my $sieveListen = $sieve{'Listen'} || '';
my $sieveAddress = "";
if ($sieveAccess eq 'localhost') {
$sieveAddress = '127.0.0.1';
} elsif ($sieveAccess eq 'private') {
$sieveAddress = "127.0.0.1 $LOCALIP";
} elsif ($sieveAccess eq 'public') {
$sieveAddress = "127.0.0.1 $LOCALIP $EXTERNALIP";
}
$sieveAddress .= " $sieveListen";
my $ports = $sieves{'TCPPort'} || '5190';
my $sievesAccess = $sieves{'access'} || 'localhost';
my $sievesListen = $sieves{'Listen'} || '';
my $sievesAddress = "";
if ($sievesAccess eq 'localhost') {
$sievesAddress = '127.0.0.1';
} elsif ($sievesAccess eq 'private') {
$sievesAddress = "127.0.0.1 $LOCALIP";
} elsif ($sievesAccess eq 'public') {
$sievesAddress = "127.0.0.1 $LOCALIP $EXTERNALIP";
}
$sievesAddress .= " $sievesListen";
if ( $sieveStatus eq 'enabled' || $sievesStatus eq 'enabled') {
$OUT .=<<"HERE";
service managesieve-login {
HERE
if ( $sieveStatus eq 'enabled' ) {
$OUT .=<<"HERE";
inet_listener sieve {
port = $port
address = $address
address = $sieveaddress
}
HERE
}
if ( $sievesStatus eq 'enabled' ) {
$OUT .=<<"HERE";
inet_listener sieves {
port = $ports
ssl = yes
address = $sievesaddress
}
HERE
}
$OUT .=<<"HERE";
}
HERE
}
else {
$OUT .= "# Sieve is disabled";