komehdaht/mailgw-salt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix PMG custom-check log ownership to avoid permission denied errors.

Browse Source 
Updated the custom_check state to manage /var/log/mail_av and checked file with pmg-smtp-filter ownership and configurable modes, and documented new pillar settings for log owner/group/modes.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
Ruslan Petrovich
2026-06-24 21:26:13 +03:00
co-authored by Cursor
parent 7373d5520f
commit 664a544aa9
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1
View File
@@ -61,6 +61,7 @@ make check MINION_ID=p-mailgw-x1-01.lmru.tech
- `pmg.update_auto_reboot` - `pmg.update_auto_reboot`
- `pmg.update_reboot_delay_minutes` - `pmg.update_reboot_delay_minutes`
- `pmg.custom_check.*` - `pmg.custom_check.*`
- `pmg.custom_check.log_dir_user|log_dir_group|log_dir_mode|log_file_mode`
- `pmg.manage_hosts_file` - `pmg.manage_hosts_file`
- `pmg.hosts_file_entries` - `pmg.hosts_file_entries`
- `pmg.wazuh.*` - `pmg.wazuh.*`
pillar/pmg.sls
+4
View File
@@ -52,6 +52,10 @@ pmg:
enabled: true enabled: true
script_path: /usr/local/bin/pmg-custom-check script_path: /usr/local/bin/pmg-custom-check
log_dir: /var/log/mail_av 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: managed_packages:
- pwgen - pwgen
ksc_superuser: ksc_superuser:
pmg/custom_check.sls
+15 -4
View File
@@ -1,6 +1,10 @@
{% set custom_check_enabled = salt['pillar.get']('pmg:custom_check:enabled', True) %} {% 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_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 = 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_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_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_*']) %} {% 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: pmg-custom-check-log-dir:
file.directory: file.directory:
- name: {{ custom_check_log_dir }} - name: {{ custom_check_log_dir }}
- user: root - user: {{ custom_check_log_dir_user }}
- group: root - group: {{ custom_check_log_dir_group }}
- mode: '0755' - mode: '{{ custom_check_log_dir_mode }}'
- recurse:
- user
- group
pmg-custom-check-log-file: pmg-custom-check-log-file:
file.touch: file.managed:
- name: {{ custom_check_log_dir }}/checked - 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: - require:
- file: pmg-custom-check-log-dir - file: pmg-custom-check-log-dir