emailrelay: fix server_tls

The --server-tls is a boolean option and don't have an arg.

Signed-off-by: Sergey Ponomarev <redacted>

diff --git a/mail/emailrelay/files/emailrelay.config b/mail/emailrelay/files/emailrelay.config
index 7b73de89608107a6403ff629c6abb02643d8a5e1..6044e92e93c9350e9a290708ae8a392d5e0a8cc5 100644 (file)
--- a/mail/emailrelay/files/emailrelay.config
+++ b/mail/emailrelay/files/emailrelay.config
@@ -6,7 +6,7 @@ config emailrelay 'server'
 #      option address_verifier '/usr/local/bin/address-verifier.sh'
 #      option domain 'my.example.com'
 #      option anonymous '1'
-#      option server_tls '/etc/path/to/certificate'
+#      option server_tls '1'
 #      option server_auth '/etc/emailrelay.auth'
 #      option extra_cmdline ''
 
@@ -19,7 +19,7 @@ config emailrelay 'proxy'
 #      option address_verifier '/usr/local/bin/address-verifier.sh'
 #      option domain 'my.example.com'
 #      option anonymous '1'
-#      option server_tls '/etc/path/to/certificate'
+#      option server_tls '1'
 #      option server_auth '/etc/emailrelay.auth'
 #      option client_tls '1'
 #      option client_auth '/etc/emailrelay.auth'

diff --git a/mail/emailrelay/files/emailrelay.init b/mail/emailrelay/files/emailrelay.init
index d4755e2ae2577731cef344ea7a63b655b566eb27..d0511a9f7141d5aa0cbea684853d9be60ce3e07f 100644 (file)
--- a/mail/emailrelay/files/emailrelay.init
+++ b/mail/emailrelay/files/emailrelay.init
@@ -16,7 +16,7 @@ emailrelay_instance()
        config_get mode "$1" mode
        config_get port "$1" port
        config_get_bool remote_clients "$1" remote_clients
-       config_get server_tls "$1" server_tls
+       config_get_bool server_tls "$1" server_tls
        config_get server_auth "$1" server_auth
        config_get extra_cmdline "$1" extra_cmdline
        config_get smarthost "$1" smarthost
@@ -36,7 +36,7 @@ emailrelay_instance()
                        [ -n "$smarthost" ] && procd_append_param command "$smarthost"
                        [ -n "$port" ] && procd_append_param command --port "$port"
                        [ "$remote_clients" = 1 ] && procd_append_param command --remote-clients
-                       [ -n "$server_tls" ] && procd_append_param command --server-tls "$server_tls"
+                       [ "$server_tls" = 1 ] && procd_append_param command --server-tls
                        [ -n "$server_auth" ] && procd_append_param command --server-auth "$server_auth"
                        [ "$client_tls" = 1 ] && procd_append_param command --client-tls
                        [ -n "$client_auth" ] && procd_append_param command --client-auth "$client_auth"