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

- 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

View File

@ -1 +1 @@
private localhost

View File

@ -1 +1 @@
service configuration

View File

@ -0,0 +1 @@
5190

View File

@ -0,0 +1 @@
private

View File

@ -0,0 +1 @@
4190

View File

@ -0,0 +1 @@
private

View File

@ -0,0 +1 @@
enabled

View File

@ -0,0 +1 @@
configuration

View File

@ -0,0 +1 @@
enabled

View File

@ -0,0 +1 @@
service

View File

@ -1,17 +1,64 @@
{ {
if (($sieve{'status'} || 'enabled') eq 'enabled'){ my $sieveStatus = $sieve{'status'} || 'enabled';
my $sievesStatus = $sieves{'status'} || 'enabled';
my $port = $sieve{'TCPPort'} || '4190'; my $port = $sieve{'TCPPort'} || '4190';
my $address = $sieve{'Listen'} || '127.0.0.1'; # should we only allow localhost ?
$OUT .=<<"HERE"; 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 { service managesieve-login {
HERE
if ( $sieveStatus eq 'enabled' ) {
$OUT .=<<"HERE";
inet_listener sieve { inet_listener sieve {
port = $port 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 HERE
} }
else { else {
$OUT .= "# Sieve is disabled"; $OUT .= "# Sieve is disabled";

View File

@ -1,5 +1,5 @@
%define version 11.0.0 %define version 11.0.0
%define release 8 %define release 9
%define name smeserver-dovecot %define name smeserver-dovecot
@ -40,8 +40,9 @@ Configure the dovecot IMAP server with sieve scripts support,
quota, ACL, extended logging, master user quota, ACL, extended logging, master user
%changelog %changelog
* Wed Sep 11 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme * Wed Sep 11 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme
- merge dovecot-extra [SME: 12735] - merge dovecot-extra [SME: 12735]
- add sieves support over ssl and improve template
* Fri Apr 05 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme * Fri Apr 05 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
- add missing requirement for portreserve [SME: 12589] - add missing requirement for portreserve [SME: 12589]