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

set timezone during setup. set salt log levels to info

salt/salt/minion.sls

@@ -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:

salt/salt/service/salt-minion.service.jinja

@@ -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

setup/so-functions

@@ -2372,6 +2372,13 @@ set_redirect() {
 			;;
 	esac
 }
+
+set_timezone() {
+
+	logCmd "timedatectl set-timezone Etc/UTC"
+
+}
+
 so_add_user() {
 	local username=$1
 	local uid=$2

setup/so-setup

@@ -58,6 +58,7 @@ while [[ $# -gt 0 ]]; do
 	esac
 done
 
+set_timezone
 # Preserve old setup/error logs
 [ -f "$error_log" ] && mv "$error_log" "$error_log.$(date +%Y-%m-%dT%H:%M:%S)"
 [ -f "$setup_log" ] && mv "$setup_log" "$setup_log.$(date +%Y-%m-%dT%H:%M:%S)"