fix(opensuse): fixes config files generation in opensuse

Signed-off-by: Felipe Zipitria <fzipitria@perceptyx.com>
This commit is contained in:
Felipe Zipitria 2020-06-07 18:53:00 -03:00
parent f128f6db79
commit 067bcf636f
No known key found for this signature in database
GPG Key ID: A5D3A8FAF97BF212
4 changed files with 28 additions and 1 deletions

View File

@ -8,6 +8,8 @@ postfix:
postsrsd_pkg: postsrsd postsrsd_pkg: postsrsd
postgrey_pkg: postgrey postgrey_pkg: postgrey
root_grp: root root_grp: root
setgid_group: postdrop
daemon_directory: /usr/libexec/postfix
service: postfix service: postfix
xbin_prefix: /usr xbin_prefix: /usr
dovecot_deliver: /usr/lib/dovecot/deliver dovecot_deliver: /usr/lib/dovecot/deliver

View File

@ -39,6 +39,11 @@
{{ set_parameter('readme_directory', 'no') }} {{ set_parameter('readme_directory', 'no') }}
# Apply default setgid_group
{{ set_parameter('setgid_group', postfix.setgid_group) }}
# Set daemon directory
{{ set_parameter('daemon_directory', postfix.daemon_directory) }}
{%- set relay_restrictions = ['permit_mynetworks'] %} {%- set relay_restrictions = ['permit_mynetworks'] %}
{%- set recipient_restrictions = ['permit_mynetworks'] %} {%- set recipient_restrictions = ['permit_mynetworks'] %}

View File

@ -1,9 +1,22 @@
{% from "postfix/map.jinja" import postfix with context %} {% from "postfix/map.jinja" import postfix with context %}
{%- if grains.os_family == "Suse" %}
# The existence of this file prevents the system to
# overwrite files from salt when installing.
/var/adm/postfix.configured:
file.managed:
- contents: ''
- mode: '0644'
- user: 'root'
- group: 'root'
- require_in:
- pkg: postfix
{%- endif %}
postfix: postfix:
pkg.installed: pkg.installed:
- name: {{ postfix.package }} - name: {{ postfix.package }}
{%- if grains['os_family']=="FreeBSD" %} {%- if grains.os_family == "FreeBSD" %}
- force: True - force: True
- batch: True - batch: True
{%- endif %} {%- endif %}

View File

@ -3,11 +3,13 @@
--- ---
Arch: Arch:
policyd_spf_pkg: python-postfix-policyd-spf policyd_spf_pkg: python-postfix-policyd-spf
daemon_directory: /usr/lib/postfix/bin
Debian: Debian:
policyd_spf_pkg: postfix-policyd-spf-python policyd_spf_pkg: postfix-policyd-spf-python
pcre_pkg: postfix-pcre pcre_pkg: postfix-pcre
mysql_pkg: postfix-mysql mysql_pkg: postfix-mysql
daemon_directory: /usr/lib/postfix/sbin
FreeBSD: FreeBSD:
policyd_spf_pkg: py27-postfix-policyd-spf-python policyd_spf_pkg: py27-postfix-policyd-spf-python
@ -15,6 +17,7 @@ FreeBSD:
xbin_prefix: /usr/local xbin_prefix: /usr/local
config_path: /usr/local/etc/postfix config_path: /usr/local/etc/postfix
root_grp: wheel root_grp: wheel
daemon_directory: /usr/local/libexec/postfix
dovecot_deliver: /usr/local/libexec/dovecot/deliver dovecot_deliver: /usr/local/libexec/dovecot/deliver
Gentoo: Gentoo:
@ -27,3 +30,7 @@ Gentoo:
RedHat: RedHat:
policyd_spf_pkg: pypolicyd-spf policyd_spf_pkg: pypolicyd-spf
Suse:
setgid_group: maildrop
daemon_directory: /usr/lib/postfix/bin