dont enable startup_states during setup. use salt to add it

This commit is contained in:
m0duspwnens
2023-12-19 09:00:32 -05:00
parent 866c9988a0
commit b3be999aea
3 changed files with 8 additions and 3 deletions

View File

@@ -29,4 +29,4 @@ so-user_sync:
- user: root
- name: 'PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/root/bin /usr/sbin/so-user sync &>> /opt/so/log/soc/sync.log'
- identifier: so-user_sync
- onlyif: "grep 'startup_states: highstate' /etc/salt/minion"
- onlyif: "grep -x 'startup_states: highstate' /etc/salt/minion"

View File

@@ -67,6 +67,11 @@ set_log_levels:
- "log_level: info"
- "log_level_logfile: info"
enable_startup_states:
file.uncomment:
- name: /etc/salt/minion
- regex: '^startup_states: highstate$'
# prior to 2.4.30 this managed file would restart the salt-minion service when updated
# since this file is currently only adding a sleep timer on service start
# it is not required to restart the service

View File

@@ -545,8 +545,8 @@ configure_minion() {
checkin_at_boot() {
local minion_config=/etc/salt/minion
info "Enabling checkin at boot"
echo "startup_states: highstate" >> "$minion_config"
# we add this commented so that we can use salt later to uncomment it
echo "#startup_states: highstate" >> "$minion_config"
}
check_requirements() {