paulbsd/paulbsd-salt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated postfix state

Browse Source
This commit is contained in:
Paul 2022-12-03 00:05:37 +01:00
parent bf89cb7c65
commit a350266b2c
3 changed files with 47 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
states/postfix/defaults.yaml
View File

@ -4,7 +4,7 @@ postfix:
base_dir: '/etc/postfix' base_dir: '/etc/postfix'
pkgs: pkgs:
- postfix - postfix
db: None db:
config: config:
main: main:
alias_database: 'hash:/etc/aliases' alias_database: 'hash:/etc/aliases'

8
states/postfix/maps.sls
View File

@ -28,8 +28,16 @@ postfix-transport:
cmd.run: cmd.run:
- name: postmap transport - name: postmap transport
- cwd: {{ postfix.base_dir }} - cwd: {{ postfix.base_dir }}
- success_stdout:
- ""
- success_retcodes:
- 0
postfix-sender-access: postfix-sender-access:
cmd.run: cmd.run:
- name: postmap sender_access - name: postmap sender_access
- cwd: {{ postfix.base_dir }} - cwd: {{ postfix.base_dir }}
#- success_stdout:
# - ""
- success_retcodes:
- 0

68
states/postfix/templates/master.cf.j2
View File

@ -1,49 +1,57 @@
## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }} ## {{ salt['pillar.get']('salt_managed', default='Salt Managed') }}
smtp inet n - - - - smtpd smtp inet n - - - - smtpd
pickup unix n - - 60 1 pickup pickup unix n - - 60 1 pickup
cleanup unix n - - - 0 cleanup cleanup unix n - - - 0 cleanup
qmgr unix n - n 300 1 qmgr qmgr unix n - n 300 1 qmgr
tlsmgr unix - - - 1000? 1 tlsmgr tlsmgr unix - - - 1000? 1 tlsmgr
rewrite unix - - - - - trivial-rewrite rewrite unix - - - - - trivial-rewrite
bounce unix - - - - 0 bounce bounce unix - - - - 0 bounce
defer unix - - - - 0 bounce defer unix - - - - 0 bounce
trace unix - - - - 0 bounce trace unix - - - - 0 bounce
verify unix - - - - 1 verify verify unix - - - - 1 verify
flush unix n - - 1000? 0 flush flush unix n - - 1000? 0 flush
proxymap unix - - n - - proxymap proxymap unix - - n - - proxymap
proxywrite unix - - n - 1 proxymap proxywrite unix - - n - 1 proxymap
smtp unix - - - - - smtp smtp unix - - - - - smtp
relay unix - - - - - smtp relay unix - - - - - smtp
showq unix n - - - - showq showq unix n - - - - showq
error unix - - - - - error error unix - - - - - error
retry unix - - - - - error retry unix - - - - - error
discard unix - - - - - discard discard unix - - - - - discard
local unix - n n - - local local unix - n n - - local
virtual unix - n n - - virtual virtual unix - n n - - virtual
lmtp unix - - - - - lmtp lmtp unix - - - - - lmtp
anvil unix - - - - 1 anvil anvil unix - - - - 1 anvil
scache unix - - - - 1 scache scache unix - - - - 1 scache
smtps inet n - n - - smtpd submission inet n - n - - smtpd
-o smtpd_tls_wrappermode=yes
-o smtpd_sasl_auth_enable=yes
-o smtpd_client_restrictions=permit_sasl_authenticated,reject
-o milter_macro_daemon_name=ORIGINATING
-o smtpd_tls_security_level=encrypt
-o smtpd_tls_auth_only=yes
smtps inet n - n - - smtpd
-o smtpd_tls_wrappermode=yes -o smtpd_tls_wrappermode=yes
-o smtpd_sasl_auth_enable=yes -o smtpd_sasl_auth_enable=yes
-o smtpd_client_restrictions=permit_sasl_authenticated,reject -o smtpd_client_restrictions=permit_sasl_authenticated,reject
-o milter_macro_daemon_name=ORIGINATING -o milter_macro_daemon_name=ORIGINATING
dovecot unix - n n - - pipe dovecot unix - n n - - pipe
flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${recipient} flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/deliver -f ${sender} -d ${recipient}
maildrop unix - n n - - pipe maildrop unix - n n - - pipe
flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient} flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}
uucp unix - n n - - pipe uucp unix - n n - - pipe
flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient) flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
maildb unix - n n - - pipe maildb unix - n n - - pipe
flags=DROhu user=vmail:vmail argv=/usr/local/apps/maildb/maildb.py --config /usr/local/apps/config/common.ini ${sender} ${original_recipient} flags=DROhu user=vmail:vmail argv=/usr/local/apps/maildb/maildb.py --config /usr/local/apps/config/common.ini ${sender} ${original_recipient}
127.0.0.1:10025 inet n - n - - smtpd 127.0.0.1:10025 inet n - n - - smtpd
-o content_filter= -o content_filter=
-o mynetworks=127.0.0.0/8 -o mynetworks=127.0.0.0/8
-o smtpd_recipient_restrictions=permit_mynetworks,reject -o smtpd_recipient_restrictions=permit_mynetworks,reject