Merge pull request #2 from davidkarlsen/master

extension of formula
This commit is contained in:
Daniel Wallace 2014-08-19 19:54:05 -05:00
commit 98285e7a87
5 changed files with 128 additions and 0 deletions

3
postfix/aliases Normal file
View File

@ -0,0 +1,3 @@
# Managed by config management
# See man 5 aliases for format
{{pillar['postfix']['aliases']}}

View File

@ -5,3 +5,57 @@ postfix:
- enable: True
- require:
- pkg: postfix
- watch:
- pkg: postfix
- file: /etc/postfix/main.cf
# postfix main configuration file
/etc/postfix/main.cf:
file.managed:
- source: salt://postfix/main.cf
- user: root
- group: root
- mode: 644
- template: jinja
- require:
- pkg: postfix
# manage /etc/aliases if data found in pillar
{% if 'aliases' in pillar.get('postfix', '') %}
/etc/aliases:
file.managed:
- source: salt://postfix/aliases
- user: root
- group: root
- mode: 644
- template: jinja
- require:
- pkg: postfix
run-newaliases:
cmd.wait:
- name: newaliases
- cwd: /
- watch:
- file: /etc/aliases
{% endif %}
# manage /etc/postfix/virtual if data found in pillar
{% if 'virtual' in pillar.get('postfix', '') %}
/etc/postfix/virtual:
file.managed:
- source: salt://postfix/virtual
- user: root
- group: root
- mode: 644
- template: jinja
- require:
- pkg: postfix
run-postmap:
cmd.wait:
- name: /usr/sbin/postmap /etc/postfix/virtual
- cwd: /
- watch:
- file: /etc/postfix/virtual
{% endif %}

View File

@ -0,0 +1,24 @@
smtp.input:
iptables.chain_present:
-
smtp.iptables.tcp:
iptables.insert:
- table: filter
- position: 1
- chain: smtp.input
- jump: ACCEPT
- match: state
- connstate: NEW,ESTABLISHED
- dport: 25
- proto: tcp
- save: True
smtp.iptables.filter:
iptables.insert:
- table: filter
- position: 1
- chain: INPUT
- jump: smtp.input
- save: True

45
postfix/main.cf Normal file
View File

@ -0,0 +1,45 @@
# Managed by config management
# 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
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
# 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.
myhostname = {{ grains['fqdn'] }}
alias_maps = hash:/etc/aliases
alias_database = hash:/etc/aliases
mydestination = {{ grains['fqdn'] }}, localhost, {{ grains['domain'] }}
relayhost =
mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
mailbox_size_limit = 0
recipient_delimiter = +
inet_interfaces = all
{% if 'virtual' in pillar.get('postfix','') %}
virtual_alias_maps = hash:/etc/postfix/virtual
{% endif %}
#TODO: move into a pillar
message_size_limit = 41943040

2
postfix/virtual Normal file
View File

@ -0,0 +1,2 @@
# Managed by config management
{{pillar['postfix']['virtual']}}