Merge pull request #11060 from Security-Onion-Solutions/issue/10922

set timezone during setup. set salt log levels to info
This commit is contained in:
Josh Patterson
2023-08-16 10:47:13 -04:00
committed by GitHub
4 changed files with 16 additions and 8 deletions

View File

@@ -47,24 +47,24 @@ hold_salt_packages:
{% endfor %}
{% endif %}
remove_info_log_level_logfile:
remove_error_log_level_logfile:
file.line:
- name: /etc/salt/minion
- match: "log_level_logfile: info"
- match: "log_level_logfile: error"
- mode: delete
remove_info_log_level:
remove_error_log_level:
file.line:
- name: /etc/salt/minion
- match: "log_level: info"
- match: "log_level: error"
- mode: delete
set_log_levels:
file.append:
- name: /etc/salt/minion
- text:
- "log_level: error"
- "log_level_logfile: error"
- "log_level: info"
- "log_level_logfile: info"
salt_minion_service_unit_file:
file.managed:

View File

@@ -1,6 +1,6 @@
[Unit]
Description=The Salt Minion
Documentation=man:salt-minion(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltstack.com/en/latest/contents.html
Documentation=man:salt-minion(1) file:///usr/share/doc/salt/html/contents.html https://docs.saltproject.io/en/latest/contents.html
After=network.target salt-master.service
[Service]
@@ -12,4 +12,4 @@ ExecStart=/usr/bin/salt-minion
ExecStartPre=/bin/sleep {{ salt['pillar.get']('salt:minion:service_start_delay', service_start_delay) }}
[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target