smeserver/smeserver-postfix
6
0
Fork 0
generated from smedev/Template-for-SMEServer-Core-Package
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Sun Dec 29 2024 Brian Read <brianr@koozali.org> 1.0-10.sme

Browse Source 
- Quotes round smtp-auth-proxy in templates for main.cf and sasl-passwd [SME: 12836]
This commit is contained in:
Brian Read 2024-12-29 06:42:00 +00:00
parent 8dff3cd3fc
commit 72362ffc32
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
root/etc/e-smith/templates/etc/postfix/main.cf/70certificates
View File

@ -11,7 +11,7 @@ smtp_tls_note_starttls_offer = yes
# was issued by a CA that is trusted by the Postfix SMTP client # was issued by a CA that is trusted by the Postfix SMTP client
}smtp_tls_security_level = { }smtp_tls_security_level = {
my $smarthost = $SMTPSmartHost || "off"; my $smarthost = $SMTPSmartHost || "off";
my $userid = ${smtp-auth-proxy}{'Userid'} || ""; my $userid = ${'smtp-auth-proxy'}{'Userid'} || "";
my $tls_security_level = $postfix{'tls_security_level'} || "may"; my $tls_security_level = $postfix{'tls_security_level'} || "may";
$tls_security_level = "encrypt" if ($smarthost ne "off" && $userid ne ""); $tls_security_level = "encrypt" if ($smarthost ne "off" && $userid ne "");
$OUT = $tls_security_level; $OUT = $tls_security_level;

6
root/etc/e-smith/templates/etc/postfix/main.cf/75smarthost
View File

@ -1,9 +1,9 @@
## SME relay outgoing mails to smarthost ## SME relay outgoing mails to smarthost
{ {
my $smarthost = $SMTPSmartHost || "off"; my $smarthost = $SMTPSmartHost || "off";
my $userid = ${smtp-auth-proxy}{'Userid'} || ""; my $userid = ${'smtp-auth-proxy'}{'Userid'} || "";
my $password = ${smtp-auth-proxy}{'Passwd'} || ""; my $password = ${'smtp-auth-proxy'}{'Passwd'} || "";
my $port = ${smtp-auth-proxy}{'PeerPort'} || "25"; my $port = ${'smtp-auth-proxy'}{'PeerPort'} || "25";
return "#Smarthost disabled" unless $smarthost ne "off"; return "#Smarthost disabled" unless $smarthost ne "off";
$OUT = "relayhost = [$smarthost]:$port\n"; $OUT = "relayhost = [$smarthost]:$port\n";
if ($userid ne "") if ($userid ne "")

6
root/etc/e-smith/templates/etc/postfix/sasl_passwd/20smarthost
View File

@ -1,9 +1,9 @@
## SME relay outgoing mails to smarthost ## SME relay outgoing mails to smarthost
{ {
my $smarthost = $SMTPSmartHost || "off"; my $smarthost = $SMTPSmartHost || "off";
my $userid = ${smtp-auth-proxy}{'Userid'} || ""; my $userid = ${'smtp-auth-proxy'}{'Userid'} || "";
my $password = ${smtp-auth-proxy}{'Passwd'} || ""; my $password = ${'smtp-auth-proxy'}{'Passwd'} || "";
my $port = ${smtp-auth-proxy}{'PeerPort'} || "25"; my $port = ${'smtp-auth-proxy'}{'PeerPort'} || "25";
return "#Smarthost disabled" unless $smarthost ne "off"; return "#Smarthost disabled" unless $smarthost ne "off";
$OUT = ""; $OUT = "";
if ($userid ne "") if ($userid ne "")

5
smeserver-postfix.spec
View File

@ -1,6 +1,6 @@
%define name smeserver-postfix %define name smeserver-postfix
%define version 1.0 %define version 1.0
%define release 9 %define release 10
Summary: This is what smeserver-postfix does. Summary: This is what smeserver-postfix does.
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
@ -24,6 +24,9 @@ AutoReqProv: no
Koozali SME Server wrapper to configure postfix Koozali SME Server wrapper to configure postfix
%changelog %changelog
* Sun Dec 29 2024 Brian Read <brianr@koozali.org> 1.0-10.sme
- Quotes round smtp-auth-proxy in templates for main.cf and sasl-passwd [SME: 12836]
* Mon Dec 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 1.0-9.sme * Mon Dec 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 1.0-9.sme
- fix virtual expected format: key whitespace value for empty group [SME: 12834] - fix virtual expected format: key whitespace value for empty group [SME: 12834]