diff --git a/README.md b/README.md index dc8c915..3763295 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Kitchen (Linux)](https://github.com/opensourcewebsite-org/osw-devops/actions/workflows/kitchen.yml/badge.svg)](https://github.com/opensourcewebsite-org/osw-devops/actions/workflows/kitchen.yml) [![License](https://img.shields.io/badge/License-MIT-brightgreen.svg?style=flat-square)](LICENSE.md) -[![SaltStack Version](https://img.shields.io/badge/SaltStack-3006.1-blue.svg?style=flat-square)](https://saltproject.io) +[![SaltStack Version](https://img.shields.io/badge/SaltStack-3006.7-blue.svg?style=flat-square)](https://saltproject.io) Server Architecture for OpenSourceWebsite, using [SaltStack](https://saltproject.io). diff --git a/pillar/prod/salt.sls b/pillar/prod/salt.sls index db9957e..b451c82 100644 --- a/pillar/prod/salt.sls +++ b/pillar/prod/salt.sls @@ -6,8 +6,8 @@ salt: master_remove_config: false install_packages: true py_ver: 'py3' - version: 3006.1 - release: '3006.1' + version: 3006.7 + release: '3006.7' lookup: salt_master: 'salt-master' salt_minion: 'salt-minion' diff --git a/pillar/salt.sls b/pillar/salt.sls index 02e3494..2d67274 100644 --- a/pillar/salt.sls +++ b/pillar/salt.sls @@ -6,8 +6,8 @@ salt: master_remove_config: false install_packages: true py_ver: 'py3' - version: 3006.1 - release: '3006.1' + version: 3006.7 + release: '3006.7' lookup: salt_minion: 'salt-minion' minion: diff --git a/salt/exim.sls b/salt/exim.sls index 20d6503..6abfabf 100644 --- a/salt/exim.sls +++ b/salt/exim.sls @@ -2,17 +2,18 @@ debconf-utils: pkg.installed: - order: 1 -exim_packages: +exim4: pkg.installed: - - pkgs: - - exim4 - require: - debconf: exim4_config - order: 2 + service.running: + - enable: True + - watch: + - file: /etc/exim4/* -exim4_setup: +exim4_config: debconf.set: - - name: exim4_config - data: 'exim4/mailname': {'type': 'string', 'value': {{ grains['localhost'] }} } 'exim4/dc_localdelivery': {'type': 'select', 'value': 'mbox format in /var/mail/'} @@ -24,14 +25,7 @@ exim4_setup: - require: - pkg: debconf-utils -exim4_service: - service.running: - - name: exim4 - - enable: True - - watch: - - file: /etc/exim4/* - -create_dir_dkim: +/etc/exim4/dkim: file.directory: - name: /etc/exim4/dkim - makedirs: True @@ -55,16 +49,6 @@ generate_public_cert: - cwd: /etc/exim4/dkim/ - creates: /etc/exim4/dkim/{{ pillar['dkim_public_key'] }} -chown_dkim: - file.directory: - - name: /etc/exim4/dkim - - makedirs: True - - user: Debian-exim - - group: Debian-exim - - recurse: - - user - - group - exim4_dkim: file.blockreplace: - name: /etc/exim4/exim4.conf.template @@ -84,14 +68,12 @@ exim4_config_localmail: - content: 'domainlist local_domains = localhost : localhost.localdomain' - match: 'domainlist local_domains = MAIN_LOCAL_DOMAINS' -exim4_config_localmacros: +/etc/exim4/exim4.conf.localmacros: file.managed: - - name: /etc/exim4/exim4.conf.localmacros - contents: 'MAIN_TLS_ENABLE = 1' -exim4_conf: +/etc/exim4/update-exim4.conf.conf: file.managed: - - name: /etc/exim4/update-exim4.conf.conf - contents: | dc_eximconfig_configtype='smarthost' dc_other_hostnames='' @@ -107,9 +89,8 @@ exim4_conf: dc_mailname_in_oh='true' dc_localdelivery='mail_spool' -exim4_passwd_client: +/etc/exim4/passwd.client: file.managed: - - name: /etc/exim4/passwd.client - user: root - group: Debian-exim - mode: 640