Commit Graph

38 Commits

Author SHA1 Message Date
Andreas Thienemann
9281c79aec Fix table type for proxy tables
http://www.postfix.org/DATABASE_README.html#types specifies the lookup
table types postfix understands.

Most are defined as type:/path/to/table which is currently supported
by the postfix formula.

This does break though as soon as the proxy table type is used which is
a prefix to a normal table definition to indicate caching is requested.

This PR changes the code to discard the proxy prefix to ensure that the
usual logic applies again.
2018-10-07 13:48:13 +02:00
Andreas Thienemann
36f0a70813 Improve handling of multiple values in main.cf
In case a list of items (iterable) is passed to the set_parameter
function in main.cf, the list of items are joined by a comma.

This makes parameters with many items a bit hard to read as it
results in long lines.

Postfix also supports an alternative declaration where subsequent
parameter values are written in a new line that starts with whitespace
and thus forms a continuation of the previous line.
This makes parsing multiple entry lines easier for humans.

Old style:
smtpd_milters = { unix:/run/spamass-milter/postfix/sock, connect_timeout=10s, default_action=accept } { inet:localhost:10003, connect_timeout=10s, default_action=accept } { inet:localhost:10004, connect_timeout=10s, default_action=accept } { inet:localhost:10006, connect_timeout=10s, default_action=accept } { inet:localhost:10007, connect_timeout=10s, default_action=accept }

New style:
smtpd_milters = { unix:/run/spamass-milter/postfix/sock, connect_timeout=10s, default_action=accept }
                { inet:localhost:10003, connect_timeout=10s, default_action=accept }
                { inet:localhost:10004, connect_timeout=10s, default_action=accept }
                { inet:localhost:10006, connect_timeout=10s, default_action=accept }
                { inet:localhost:10007, connect_timeout=10s, default_action=accept }
2018-09-29 03:55:38 +02:00
Andre Sencioles
e40c589cd5 Fix duplicated mapping parameters on main.cf
Fixes the creation of duplicated parameters on main.cf by using the
"set_parameter" macro to append the mapping parameter to the
"processed_parameters" list.
2018-08-29 15:34:31 +12:00
Benjamin DUPUIS
fe261fc635 add inet_protocols 2018-07-09 11:32:16 +02:00
Javier Bértoli
47ffa7d173 Fix xbin_prefix parameter, add managed by Salt headers 2018-03-18 14:08:45 -03:00
Alexander Weidinger
014c5227bc Let the user handle mappings manually 2017-12-08 14:53:58 +01:00
Florian Ermisch
f514881e5a explain the difference between alias_maps and alias_database 2017-08-24 13:35:24 +02:00
Florian Ermisch
c60c3bab6f adjust processed_parameters to match pillar.example 2017-08-24 13:25:38 +02:00
Florian Ermisch
8eed254773 one for-loop for all of the mappings 2017-08-24 13:10:54 +02:00
Javier Bértoli
026dd44dde Minor formatting change 2017-03-29 08:19:33 -03:00
Javier Bértoli
b0aa531297 Use join() for iterable values in main.cf 2017-03-28 11:57:34 -03:00
Niels Abspoel
b632899833 fix missing bracket 2016-01-02 20:20:54 +01:00
david
bcf0ec995f add config parameter smtp_tls_CApath to validate peers 2015-12-31 16:00:43 +01:00
Gilles Dartiguelongue
e20aeb5d89 Fix handling of smtpd_sasl_auth_enable
Defaults to yes but will not write yes unless a default is provided to
set_parameter.
2015-10-02 23:11:50 +02:00
Gilles Dartiguelongue
51d2e5936d Fix excessive whitespace stripping 2015-10-02 23:11:27 +02:00
Scott Reid
9326095571 enable creation of smtp_sasl_password_maps file from pillar 2015-09-02 11:59:57 -07:00
Richard Clark
83c0a448fe - Fix virtual handling - can't just dump json to virtual
- Add in handling for sender_canonical
- Add examples to pillar
2015-08-31 16:34:51 -04:00
Gilles Dartiguelongue
6bec84cc23 Remove extra whitespaces in generated file 2015-08-30 18:52:25 +02:00
Gilles Dartiguelongue
609737b0cc Enhance default TLS configuration
Increase default security settings according to upstream documentation
tough it is by no mean perfect.
2015-08-30 18:51:42 +02:00
Gilles Dartiguelongue
2e0e9cdd27 Add SASL handling
Still requires some manual actions like installing SASL provider and
configuring it but this is a first step.
2015-08-30 18:51:42 +02:00
Gilles Dartiguelongue
da1995119a Rework restrictions parameter building
It still included SASL configuration that is nowhere to be found in
current main.cf template.
2015-08-30 18:51:42 +02:00
Gilles Dartiguelongue
542be4f5bb Wrap TLS and relay options in conditional blocks
Basic setting enabling such feature enable the rest of the default statements.
2015-08-30 18:51:42 +02:00
Dominik Schleich
ae7ada3bb8 changed the default aliases variable name to match the one checked in init.sls / one overseen use 2015-08-27 16:16:54 +02:00
Dominik Schleich
04f365170d changed the default aliases variable name to match the one checked in init.sls this times also in the template 2015-08-27 16:14:57 +02:00
Gilles Dartiguelongue
cbd9aeebe9 Restore policyd-spf support 2015-08-22 14:01:29 +02:00
Gilles Dartiguelongue
04f97681eb Handle postgrey setup in main.cf 2015-08-22 13:36:18 +02:00
Gilles Dartiguelongue
9219b5e608 Add support for parameters as lists
As found in postfix documentation.
2015-08-22 13:26:46 +02:00
Gilles Dartiguelongue
a5ddb403c8 Remove policyd SPF management until it is better managed 2015-08-22 13:26:46 +02:00
Gilles Dartiguelongue
36f627aad8 Add support for using distribution's aliases 2015-08-22 12:14:21 +02:00
Imran Haider
b29a2e4180 Use new default settings 2015-06-20 19:23:12 -04:00
jeroen92
493298fff1 Add option to let the module (not) manage the master.cf 2015-03-25 12:49:57 +01:00
david
5c6b07869f add spf handling 2015-02-05 09:57:18 +01:00
david
2faeb5ea5f should accept localhost as well as localhost.localdomain 2015-02-04 13:07:35 +01:00
david
81c97bdc63 fix todo and use similar pattern as for the rest of the parameters 2015-02-04 12:16:36 +01:00
Raphaël Hertzog
d61167dcb7 Special case the 'aliases' and 'virtual' pillar entries
They must not be added as non-standard parameters, they constitute
data for other files.

Fixes #6.
2015-01-09 18:05:14 +01:00
Skyler Berg
78f3a47bec Refactor postfix formula to work with arbitrary parameters 2014-11-21 11:16:17 -08:00
skyler
755c7b64ba Make postfix.config state work with latest changes 2014-08-19 18:42:08 -07:00
skyler
e882f1a4d1 Add config state and main.cf config file 2014-08-19 17:32:47 -07:00