diff options
| author | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:44:50 -0700 |
|---|---|---|
| committer | Dan Fandrich <danf@mageia.org> | 2024-10-04 21:48:08 -0700 |
| commit | f5b2645d869b76598c18527d388ed76719c06bdd (patch) | |
| tree | 659f3ee719b437817a02db4a31dbd37a65972412 /modules/postfix/templates/main.cf | |
| parent | ae1976228660588902a904f7509a106b790531cb (diff) | |
| download | puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.gz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.bz2 puppet-f5b2645d869b76598c18527d388ed76719c06bdd.tar.xz puppet-f5b2645d869b76598c18527d388ed76719c06bdd.zip | |
Revert "Use @ when accessing variables in templates"
Variables defined within a template can't be accessed with @. This
change needs to be reworked to eliminate those cases.
This reverts commits 2c7da665 and ae197622.
Diffstat (limited to 'modules/postfix/templates/main.cf')
| -rw-r--r-- | modules/postfix/templates/main.cf | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/modules/postfix/templates/main.cf b/modules/postfix/templates/main.cf index 9fe072b2..7fe0f073 100644 --- a/modules/postfix/templates/main.cf +++ b/modules/postfix/templates/main.cf @@ -21,7 +21,7 @@ mailq_path = /usr/bin/mailq queue_directory = /var/spool/postfix mail_owner = postfix <% if all_tags.include?('postfix::simple_relay') || all_tags.include?('postfix::server::secondary') %> -relayhost = sucuk.<%= @domain %> +relayhost = sucuk.<%= domain %> <%- end -%> # User configurable parameters @@ -40,21 +40,21 @@ smtp_address_preference = ipv4 # FIXME Do not hardcode this mynetworks = 212.85.158.144/28 [2a02:2178:2:7::]/64 127.0.0.1 163.172.148.228 [2001:bc8:4400:2800::4115] -myhostname = <%= @fqdn %> -mydomain = <%= @domain %> +myhostname = <%= fqdn %> +mydomain = <%= domain %> <%- if all_tags.include?('postfix::server::secondary') -%> -relay_domains = <%= @domain %>, - ml.<%= @domain %>, - group.<%= @domain %> +relay_domains = <%= domain %>, + ml.<%= domain %>, + group.<%= domain %> <%- end -%> -mydestination = <%= @fqdn %> - ml.<%= @domain %> +mydestination = <%= fqdn %> + ml.<%= domain %> <%- if all_tags.include?('postfix::server::primary') -%> -virtual_mailbox_domains = <%= @domain %>, - group.<%= @domain %> +virtual_mailbox_domains = <%= domain %>, + group.<%= domain %> # postfix complain if not set # Mar 22 23:51:20 alamut postfix/virtual[22952]: fatal: bad string length 0 < 1: virtual_mailbox_base = @@ -98,7 +98,7 @@ sympabounce_destination_recipient_limit = 1 <%- end -%> #delay_warning_time = 4h -smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (<%= @lsbdistid %>) +smtpd_banner = $myhostname ESMTP $mail_name ($mail_version) (<%= lsbdistid %>) unknown_local_recipient_reject_code = 450 smtp-filter_destination_concurrency_limit = 2 lmtp-filter_destination_concurrency_limit = 2 |