diff --git a/README.md b/README.md index f0b253d..475b712 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,7 @@ make check MINION_ID=p-mailgw-x1-01.lmru.tech - `pmg.update_auto_reboot` - `pmg.update_reboot_delay_minutes` - `pmg.custom_check.*` + - `pmg.custom_check.log_dir_user|log_dir_group|log_dir_mode|log_file_mode` - `pmg.manage_hosts_file` - `pmg.hosts_file_entries` - `pmg.wazuh.*` diff --git a/pillar/pmg.sls b/pillar/pmg.sls index 8433b38..9c96b57 100644 --- a/pillar/pmg.sls +++ b/pillar/pmg.sls @@ -52,6 +52,10 @@ pmg: enabled: true script_path: /usr/local/bin/pmg-custom-check log_dir: /var/log/mail_av + log_dir_user: pmg-smtp-filter + log_dir_group: pmg + log_dir_mode: "0770" + log_file_mode: "0660" managed_packages: - pwgen ksc_superuser: diff --git a/pmg/custom_check.sls b/pmg/custom_check.sls index 1f60a30..e3c54c2 100644 --- a/pmg/custom_check.sls +++ b/pmg/custom_check.sls @@ -1,6 +1,10 @@ {% set custom_check_enabled = salt['pillar.get']('pmg:custom_check:enabled', True) %} {% set custom_check_script_path = salt['pillar.get']('pmg:custom_check:script_path', '/usr/local/bin/pmg-custom-check') %} {% set custom_check_log_dir = salt['pillar.get']('pmg:custom_check:log_dir', '/var/log/mail_av') %} +{% set custom_check_log_dir_user = salt['pillar.get']('pmg:custom_check:log_dir_user', 'pmg-smtp-filter') %} +{% set custom_check_log_dir_group = salt['pillar.get']('pmg:custom_check:log_dir_group', 'pmg') %} +{% set custom_check_log_dir_mode = salt['pillar.get']('pmg:custom_check:log_dir_mode', '0770') %} +{% set custom_check_log_file_mode = salt['pillar.get']('pmg:custom_check:log_file_mode', '0660') %} {% set custom_check_managed_packages = salt['pillar.get']('pmg:custom_check:managed_packages', ['pwgen']) %} {% set custom_check_required_services = salt['pillar.get']('pmg:custom_check:required_services', ['kesl', 'klnagent64']) %} {% set custom_check_kesl_excluded_paths = salt['pillar.get']('pmg:custom_check:kesl_excluded_paths', ['/var/spool/pmg', '/var/lib/clamav', '/tmp/.proxdump_*']) %} @@ -50,13 +54,20 @@ pmg-custom-check-managed-packages: pmg-custom-check-log-dir: file.directory: - name: {{ custom_check_log_dir }} - - user: root - - group: root - - mode: '0755' + - user: {{ custom_check_log_dir_user }} + - group: {{ custom_check_log_dir_group }} + - mode: '{{ custom_check_log_dir_mode }}' + - recurse: + - user + - group pmg-custom-check-log-file: - file.touch: + file.managed: - name: {{ custom_check_log_dir }}/checked + - user: {{ custom_check_log_dir_user }} + - group: {{ custom_check_log_dir_group }} + - mode: '{{ custom_check_log_file_mode }}' + - replace: false - require: - file: pmg-custom-check-log-dir