Add and update options to allow mimicry of 22.04 defaults

REFERENCE.md

@@ -73,9 +73,13 @@ The following parameters are available in the `exim` class:
 * [`delay_warning`](#-exim--delay_warning)
 * [`deliver_queue_load_max`](#-exim--deliver_queue_load_max)
 * [`disable_ipv6`](#-exim--disable_ipv6)
+* [`dns_dnssec_ok`](#-exim--dns_dnssec_ok)
 * [`errors_reply_to`](#-exim--errors_reply_to)
+* [`exim_path`](#-exim--exim_path)
 * [`extract_addresses_remove_arguments`](#-exim--extract_addresses_remove_arguments)
 * [`freeze_tell`](#-exim--freeze_tell)
+* [`gecos_name`](#-exim--gecos_name)
+* [`gecos_pattern`](#-exim--gecos_pattern)
 * [`gnutls_compat_mode`](#-exim--gnutls_compat_mode)
 * [`openssl_options`](#-exim--openssl_options)
 * [`heavy`](#-exim--heavy)
@@ -86,6 +90,7 @@ The following parameters are available in the `exim` class:
 * [`includes`](#-exim--includes)
 * [`local_from_check`](#-exim--local_from_check)
 * [`local_interfaces`](#-exim--local_interfaces)
+* [`local_sender_retain`](#-exim--local_sender_retain)
 * [`log_lost_incoming_connection`](#-exim--log_lost_incoming_connection)
 * [`log_retry_defer`](#-exim--log_retry_defer)
 * [`log_sender_on_delivery`](#-exim--log_sender_on_delivery)
@@ -141,6 +146,8 @@ The following parameters are available in the `exim` class:
 * [`message_size_limit`](#-exim--message_size_limit)
 * [`mysql_servers`](#-exim--mysql_servers)
 * [`never_users`](#-exim--never_users)
+* [`prdr_enable`](#-exim--prdr_enable)
+* [`primary_hostname`](#-exim--primary_hostname)
 * [`qualify_domain`](#-exim--qualify_domain)
 * [`queue_only_load`](#-exim--queue_only_load)
 * [`queue_run_max`](#-exim--queue_run_max)
@@ -159,8 +166,10 @@ The following parameters are available in the `exim` class:
 * [`smtp_receive_timeout`](#-exim--smtp_receive_timeout)
 * [`smtp_reserve_hosts`](#-exim--smtp_reserve_hosts)
 * [`smtp_return_error_details`](#-exim--smtp_return_error_details)
+* [`smtputf8_advertise_hosts`](#-exim--smtputf8_advertise_hosts)
 * [`spamd_address`](#-exim--spamd_address)
 * [`split_spool_directory`](#-exim--split_spool_directory)
+* [`spool_directory`](#-exim--spool_directory)
 * [`syslog_timestamp`](#-exim--syslog_timestamp)
 * [`system_filter`](#-exim--system_filter)
 * [`timeout_frozen_after`](#-exim--timeout_frozen_after)
@@ -380,6 +389,15 @@ Data type: `Optional[Boolean]`
 Do no IPv6 processing
 Type: bool
 
+##### <a name="-exim--dns_dnssec_ok"></a>`dns_dnssec_ok`
+
+Data type: `Optional[Integer]`
+
+If this option is set to a non-negative number then Exim will initialise the
+DNS resolver library to either use or not use DNSSEC, overriding the system
+default. A value of 0 coerces DNSSEC off, a value of 1 coerces DNSSEC on.
+The Exim default is -1.
+
 ##### <a name="-exim--errors_reply_to"></a>`errors_reply_to`
 
 Data type: `Optional[String]`
@@ -388,6 +406,12 @@ This sets a mail-address to be used in the reply-to header of bounce-messages.
 Type: String
 Example: postmaster@example.com
 
+##### <a name="-exim--exim_path"></a>`exim_path`
+
+Data type: `Optional[String]`
+
+Path of the Exim binary.
+
 ##### <a name="-exim--extract_addresses_remove_arguments"></a>`extract_addresses_remove_arguments`
 
 Data type: `Optional[Boolean]`
@@ -402,6 +426,21 @@ Data type: `Optional[String]`
 
 If a mail gets frozen, send a notification to the address defined here.
 
+##### <a name="-exim--gecos_name"></a>`gecos_name`
+
+Data type: `Optional[String]`
+
+If gecos_name and gecos_pattern are set then gecos_pattern is treated as a regular
+expression that is to be applied to the gecos field and if it matches, gecos_name
+is expanded and used as the user's name.  For example, $1 could be used to pick up
+the first sub-field that was matched by the gecos_pattern.
+
+##### <a name="-exim--gecos_pattern"></a>`gecos_pattern`
+
+Data type: `Optional[String]`
+
+See gecos_name above.
+
 ##### <a name="-exim--gnutls_compat_mode"></a>`gnutls_compat_mode`
 
 Data type: `Optional[Boolean]`
@@ -474,6 +513,13 @@ Data type: `Optional[Array[String]]`
 
 Specifies the interfaces exim will listen on.
 
+##### <a name="-exim--local_sender_retain"></a>`local_sender_retain`
+
+Data type: `Optional[Boolean]`
+
+If local_from_check is false, setting local_sender_retain to true will keep any
+existing Sender header line.
+
 ##### <a name="-exim--log_lost_incoming_connection"></a>`log_lost_incoming_connection`
 
 Data type: `Optional[Boolean]`
@@ -811,6 +857,21 @@ Data type: `Optional[Array[String]]`
 Do not run deliverys as these users
 Type: array
 
+##### <a name="-exim--prdr_enable"></a>`prdr_enable`
+
+Data type: `Optional[Boolean]`
+
+Enable the Per-Recipient Data Response extension to SMTP.
+
+##### <a name="-exim--primary_hostname"></a>`primary_hostname`
+
+Data type: `Optional[String]`
+
+This specifies the name of the current host. It is used in the default
+EHLO or HELO command for outgoing SMTP messages (changeable via the
+helo_data option in the smtp transport), and as the default for qualify_domain.
+Default is empty which exim should fill with the FQDN for the server.
+
 ##### <a name="-exim--qualify_domain"></a>`qualify_domain`
 
 Data type: `Optional[String]`
@@ -931,6 +992,12 @@ Data type: `Optional[Boolean]`
 
 Return more detailed SMTP error messages.
 
+##### <a name="-exim--smtputf8_advertise_hosts"></a>`smtputf8_advertise_hosts`
+
+Data type: `Optional[String]`
+
+Advertise SMTPUTF8 to these hosts.
+
 ##### <a name="-exim--spamd_address"></a>`spamd_address`
 
 Data type: `Optional[String]`
@@ -944,6 +1011,12 @@ Data type: `Optional[Boolean]`
 Use split spool configuration
 Type: bool
 
+##### <a name="-exim--spool_directory"></a>`spool_directory`
+
+Data type: `Optional[String]`
+
+Override compiled-in value.
+
 ##### <a name="-exim--syslog_timestamp"></a>`syslog_timestamp`
 
 Data type: `Optional[Boolean]`
@@ -995,7 +1068,7 @@ If this option ist set to true code values of 128 and above are also considered
 
 ##### <a name="-exim--untrusted_set_sender"></a>`untrusted_set_sender`
 
-Data type: `Optional[Boolean]`
+Data type: `Optional[Array[String]]`
 
 This option allows you to permit untrusted users to set other envelope sender addresses in a controlled way.
 

data/common.yaml

@@ -46,17 +46,22 @@ exim::daemon_smtp_ports: ~
 exim::delay_warning: ~
 exim::deliver_queue_load_max: ~
 exim::disable_ipv6: ~
+exim::dns_dnssec_ok: ~
 exim::errors_reply_to: ~
 exim::exim_heavy_package: ~
 exim::exim_light_package: ~
+exim::exim_path: ~
 exim::extract_addresses_remove_arguments: ~
 exim::freeze_tell: ~
+exim::gecos_name: ~
+exim::gecos_pattern: ~
 exim::gnutls_compat_mode: ~
 exim::helo_allow_chars: ~
 exim::hosts_treat_as_local: ~
 exim::ldap_default_servers: ~
 exim::local_from_check: ~
 exim::local_interfaces: ~
+exim::local_sender_retain: ~
 exim::log_8bitmime: ~
 exim::log_acl_warn_skipped: ~
 exim::log_address_rewrite: ~
@@ -101,6 +106,8 @@ exim::message_logs: ~
 exim::message_size_limit: ~
 exim::mysql_servers: ~
 exim::openssl_options: ~
+exim::prdr_enable: ~
+exim::primary_hostname: ~
 exim::qualify_domain: ~
 exim::queue_only_load: ~
 exim::queue_run_max: ~
@@ -118,8 +125,10 @@ exim::smtp_banner: ~
 exim::smtp_receive_timeout: ~
 exim::smtp_reserve_hosts: ~
 exim::smtp_return_error_details: ~
+exim::smtputf8_advertise_hosts: ~
 exim::spamd_address: ~
 exim::split_spool_directory: ~
+exim::spool_directory: ~
 exim::syslog_timestamp: ~
 exim::system_filter: ~
 exim::tls_advertise_hosts: ~

manifests/init.pp

@@ -123,11 +123,22 @@
 #   Do no IPv6 processing
 #   Type: bool
 #
+# @param dns_dnssec_ok
+#   If this option is set to a non-negative number then Exim will initialise the
+#   DNS resolver library to either use or not use DNSSEC, overriding the system
+#   default. A value of 0 coerces DNSSEC off, a value of 1 coerces DNSSEC on.
+#   The Exim default is -1.
+#   Type: integer
+#
 # @param errors_reply_to
 #   This sets a mail-address to be used in the reply-to header of bounce-messages.
 #   Type: String
 #   Example: postmaster@example.com
 #
+# @param exim_path
+#   Path of the Exim binary.
+#   Type: string
+#
 # @param extract_addresses_remove_arguments
 #   When using exims -t option, rcpts from the Mail-Headers are used, and rcpts given
 #   on the command-line are substracted, setting this to false will add the rcpts instead
@@ -136,6 +147,17 @@
 # @param freeze_tell
 #   If a mail gets frozen, send a notification to the address defined here.
 #
+# @param gecos_name
+#   If gecos_name and gecos_pattern are set then gecos_pattern is treated as a regular
+#   expression that is to be applied to the gecos field and if it matches, gecos_name
+#   is expanded and used as the user's name.  For example, $1 could be used to pick up
+#   the first sub-field that was matched by the gecos_pattern.
+#   Type: string
+#
+# @param gecos_pattern
+#   See gecos_name above.
+#   Type: string
+#
 # @param gnutls_compat_mode
 #   This controls if gnutls is used in compatiblity mode.
 #   Set this to true to slightly reduce security, but improve compatiblity with older
@@ -178,6 +200,10 @@
 # @param local_interfaces
 #   Specifies the interfaces exim will listen on.
 #
+# @param local_sender_retain
+#   If local_from_check is false, setting local_sender_retain to true will keep any
+#   existing Sender header line.
+#
 # @param log_lost_incoming_connection
 #   Configures the log_selector to log timeouting incomming connections
 #
@@ -350,10 +376,22 @@
 #   Do not run deliverys as these users
 #   Type: array
 #
+# @param prdr_enable
+#   Enable the Per-Recipient Data Response extension to SMTP.
+#   Type: boolean
+#
+# @param primary_hostname
+#   This specifies the name of the current host. It is used in the default
+#   EHLO or HELO command for outgoing SMTP messages (changeable via the
+#   helo_data option in the smtp transport), and as the default for qualify_domain.
+#   Default is empty which exim should fill with the FQDN for the server.
+#   Type: string
+#
 # @param qualify_domain
 #   configure the domain, which is automatically added to email addresses
 #   without a domain part. Default is empty, which exim treats as the
 #   primary hostname.
+#   Type: string
 #
 # @param queue_only_load
 #   Do not run imediate deliveries if load is above this threshhold.
@@ -416,13 +454,21 @@
 # @param smtp_return_error_details
 #   Return more detailed SMTP error messages.
 #
+# @param smtputf8_advertise_hosts
+#   Advertise SMTPUTF8 to these hosts.
+#   Type: string
+#
 # @param spamd_address
 #   Configure a spamd socket here.
 #
 # @param split_spool_directory
 #   Use split spool configuration
 #   Type: bool
 #
+# @param spool_directory
+#   Override compiled-in value.
+#   Type: string
+#
 # @param syslog_timestamp
 #   Don't send timestamps to syslog.
 #
@@ -450,6 +496,7 @@
 #
 # @param untrusted_set_sender
 #   This option allows you to permit untrusted users to set other envelope sender addresses in a controlled way.
+#   Type: array
 #
 # @param tls_require_ciphers
 #   This option controls which ciphers can be used for incoming TLS connections.
@@ -505,9 +552,13 @@
   Optional[Array[String]] $delay_warning,
   Optional[Integer] $deliver_queue_load_max,
   Optional[Boolean] $disable_ipv6,
+  Optional[Integer] $dns_dnssec_ok,
+  Optional[String] $exim_path,
   Optional[String] $errors_reply_to,
   Optional[Boolean] $extract_addresses_remove_arguments,
   Optional[String] $freeze_tell,
+  Optional[String] $gecos_name,
+  Optional[String] $gecos_pattern,
   Optional[Boolean] $gnutls_compat_mode,
   Optional[String] $openssl_options,
   Optional[Boolean] $heavy,
@@ -519,6 +570,7 @@
   Optional[Array[String]] $ldap_default_servers,
   Optional[Boolean] $local_from_check,
   Optional[Array[String]] $local_interfaces,
+  Optional[Boolean] $local_sender_retain,
   Optional[Array[String]] $log_file_path,
   Optional[Boolean] $log_lost_incoming_connection,
   Optional[Boolean] $log_retry_defer,
@@ -574,9 +626,11 @@
   Optional[String] $message_size_limit,
   Optional[Array[String]] $mysql_servers,
   Optional[Array[String]] $never_users,
-  Optional[Boolean] $untrusted_set_sender,
+  Optional[Array[String]] $untrusted_set_sender,
   Optional[Boolean] $print_topbitchars,
   Optional[String] $tls_require_ciphers,
+  Optional[Boolean] $prdr_enable,
+  Optional[String] $primary_hostname,
   Optional[String] $qualify_domain,
   Optional[Integer] $queue_only_load,
   Optional[Integer] $queue_run_max,
@@ -595,8 +649,10 @@
   Optional[String] $smtp_receive_timeout,
   Optional[Array[String]] $smtp_reserve_hosts,
   Optional[Boolean] $smtp_return_error_details,
+  Optional[String] $smtputf8_advertise_hosts,
   Optional[String] $spamd_address,
   Optional[Boolean] $split_spool_directory,
+  Optional[String] $spool_directory,
   Optional[Boolean] $syslog_timestamp,
   Optional[String] $system_filter,
   Optional[String] $timeout_frozen_after,