Fix TODO's

Oefenweb · Mar 20, 2024 · df801e2 · df801e2
1 parent aad7e12
commit df801e2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -71,13 +71,15 @@ None
  * `postfix_smtpd_tls_key_file` [default: `/etc/ssl/certs/ssl-cert-snakeoil.key`]: Path to key file
 
  * `postfix_smtpd_security_level` [optional]: The SMTP TLS security level for the Postfix SMTP server ([see](http://www.postfix.org/postconf.5.html#smtpd_tls_security_level))
+
+ * `postfix_smtp_tls_mandatory_ciphers` [optional]: The minimum TLS cipher grade that the Postfix SMTP client will use with mandatory TLS ([see](https://www.postfix.org/postconf.5.html#smtp_tls_mandatory_ciphers))
+ * `postfix_smtp_tls_mandatory_protocols` [optional]: TLS protocols that the Postfix SMTP client will use with mandatory TLS encryption ([see](https://www.postfix.org/postconf.5.smtp_tls_mandatory_protocols))
+ * `postfix_smtp_tls_protocols` [optional]: TLS protocols that the Postfix SMTP client will use with opportunistic TLS encryption ([see](https://www.postfix.org/postconf.5.html#smtp_tls_protocols))
+ * `postfix_smtpd_tls_mandatory_ciphers` [optional]: The minimum TLS cipher grade that the Postfix SMTP server will use with mandatory TLS encryption. ([see](https://www.postfix.org/postconf.5.html#smtpd_tls_mandatory_ciphers))
+ * `postfix_smtpd_tls_mandatory_protocols` [optional]: TLS protocols accepted by the Postfix SMTP server with mandatory TLS encryption ([see](https://www.postfix.org/postconf.5.html#smtpd_tls_mandatory_protocols))
+ * `postfix_smtpd_tls_protocols` [optional]: TLS protocols accepted by the Postfix SMTP server with opportunistic TLS encryption ([see](https://www.postfix.org/postconf.5.html#smtpd_tls_protocols))
+
  * `postfix_raw_options` [default: `[]`]: List of lines (to pass extra (unsupported) configuration)
- * `postfix_smtp_tls_mandatory_ciphers` [default: `undefined`]: The minimum TLS cipher grade that the Postfix SMTP client will use with mandatory TLS ([see](https://www.postfix.org/postconf.5.html#smtp_tls_mandatory_ciphers))
- * `postfix_smtp_tls_mandatory_protocols` [default: `undefined`]: TLS protocols that the Postfix SMTP client will use with mandatory TLS encryption ([see](https://www.postfix.org/postconf.5.smtp_tls_mandatory_protocols))
- * `postfix_smtp_tls_protocols` [default: `undefined`]: TLS protocols that the Postfix SMTP client will use with opportunistic TLS encryption ([see](https://www.postfix.org/postconf.5.html#smtp_tls_protocols))
- * `postfix_smtpd_tls_mandatory_ciphers` [default: `undefined`]: The minimum TLS cipher grade that the Postfix SMTP server will use with mandatory TLS encryption. ([see](https://www.postfix.org/postconf.5.html#smtpd_tls_mandatory_ciphers))
- * `postfix_smtpd_tls_mandatory_protocols` [default: `undefined`]: TLS protocols accepted by the Postfix SMTP server with mandatory TLS encryption ([see](https://www.postfix.org/postconf.5.html#smtpd_tls_mandatory_protocols))
- * `postfix_smtpd_tls_protocols` [default: `undefined`]: TLS protocols accepted by the Postfix SMTP server with opportunistic TLS encryption ([see](https://www.postfix.org/postconf.5.html#smtpd_tls_protocols))
 
 
 ## Dependencies

diff --git a/templates/etc/postfix/main.cf.j2 b/templates/etc/postfix/main.cf.j2
@@ -32,27 +32,21 @@ smtpd_tls_security_level = {{ postfix_smtpd_tls_security_level }}
 smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 
-# smtp : SMTP sortant
 {% if postfix_smtp_tls_mandatory_ciphers is defined %}
 smtp_tls_mandatory_ciphers = {{ postfix_smtp_tls_mandatory_ciphers }}
 {% endif %}
-
 {% if postfix_smtpd_tls_mandatory_ciphers is defined %}
 smtpd_tls_mandatory_ciphers = {{ postfix_smtpd_tls_mandatory_ciphers }}
 {% endif %}
-
 {% if postfix_smtpd_tls_mandatory_protocols is defined %}
 smtpd_tls_mandatory_protocols = {{ postfix_smtpd_tls_mandatory_protocols }}
 {% endif %}
-
 {% if postfix_smtpd_tls_protocols is defined %}
 smtpd_tls_protocols = {{ postfix_smtpd_tls_protocols }}
 {% endif %}
-
 {% if postfix_smtp_tls_mandatory_protocols is defined %}
 smtp_tls_mandatory_protocols = {{ postfix_smtp_tls_mandatory_protocols }}
 {% endif %}
-
 {% if postfix_smtp_tls_protocols is defined %}
 smtp_tls_protocols = {{ postfix_smtp_tls_protocols }}
 {% endif %}