* 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

root/etc/e-smith/db/configuration/defaults/sieve/access

@@ -1 +1 @@
-private
+localhost

root/etc/e-smith/db/configuration/defaults/sieve/type

@@ -1 +1 @@
-service
+configuration

root/etc/e-smith/db/configuration/defaults/sieves/TCPPort

@@ -0,0 +1 @@
+5190

root/etc/e-smith/db/configuration/defaults/sieves/access

@@ -0,0 +1 @@
+private

root/etc/e-smith/db/configuration/defaults/sieves/sieve/TCPPort

@@ -0,0 +1 @@
+4190

root/etc/e-smith/db/configuration/defaults/sieves/sieve/access

@@ -0,0 +1 @@
+private

root/etc/e-smith/db/configuration/defaults/sieves/sieve/status

@@ -0,0 +1 @@
+enabled

root/etc/e-smith/db/configuration/defaults/sieves/sieve/type

@@ -0,0 +1 @@
+configuration

root/etc/e-smith/db/configuration/defaults/sieves/status

@@ -0,0 +1 @@
+enabled

root/etc/e-smith/db/configuration/defaults/sieves/type

@@ -0,0 +1 @@
+service

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

@@ -1,17 +1,64 @@
 {
-if (($sieve{'status'} || 'enabled') eq 'enabled'){
+my $sieveStatus = $sieve{'status'} || 'enabled';
-    my $port = $sieve{'TCPPort'} || '4190';
+my $sievesStatus = $sieves{'status'} || 'enabled';
-    my $address = $sieve{'Listen'} || '127.0.0.1';
+my $port = $sieve{'TCPPort'} || '4190';
-    $OUT .=<<"HERE";
+# 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";

smeserver-dovecot.spec

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