Browse Source

postfix: Add main.cf.Debian.buster, renamed master.cf.* to file.OS.RELEASE schema.

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
Maximilian Wilhelm 4 years ago
parent
commit
b67bb6380d

+ 2 - 1
postfix/init.sls

@@ -23,7 +23,7 @@ postfix:
   file.managed:
     - source:
       - salt://postfix/master.cf.{{ grains['id'] }}
-      - salt://postfix/master.cf.{{ grains.oscodename }}
+      - salt://postfix/master.cf.{{ grains.os }}.{{ grains.oscodename }}
     - watch_in:
       - service: postfix
 
@@ -32,6 +32,7 @@ postfix:
   file.managed:
     - source:
       - salt://postfix/main.cf.{{ grains['id'] }}
+      - salt://postfix/main.cf.{{ grains.os }}.{{ grains.oscodename }}
       - salt://postfix/main.cf
     - template: jinja
     - watch_in:

+ 45 - 0
postfix/main.cf.Debian.buster

@@ -0,0 +1,45 @@
+# See /usr/share/postfix/main.cf.dist for a commented, more complete version
+
+
+# Debian specific:  Specifying a file name will cause the first
+# line of that file to be used as the name.  The Debian default
+# is /etc/mailname.
+#myorigin = /etc/mailname
+
+smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
+biff = no
+
+# appending .domain is the MUA's job.
+append_dot_mydomain = no
+
+# Uncomment the next line to generate "delayed mail" warnings
+#delay_warning_time = 4h
+
+readme_directory = no
+
+# See http://www.postfix.org/COMPATIBILITY_README.html -- default to 2 on
+# fresh installs.
+compatibility_level = 2
+
+# TLS parameters
+smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
+smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
+smtpd_use_tls=yes
+smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
+smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
+
+# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
+# information on enabling SSL in the smtp client.
+
+smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_unauth_destination
+myhostname = {{ grains['id'] }}
+alias_maps = hash:/etc/aliases
+alias_database = hash:/etc/aliases
+myorigin = /etc/mailname
+mydestination = {{ grains['id'] }}, localhost
+relayhost = mail.ffho.net
+mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
+mailbox_size_limit = 0
+recipient_delimiter = +
+inet_interfaces = all
+inet_protocols = all

+ 0 - 0
postfix/master.cf.buster → postfix/master.cf.Debian.buster


+ 0 - 0
postfix/master.cf.jessie → postfix/master.cf.Debian.jessie


+ 0 - 0
postfix/master.cf.stretch → postfix/master.cf.Debian.stretch