Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SLE15 related fixes in ntp and aide rules #12548

Merged
merged 3 commits into from
Oct 30, 2024
Merged

SLE15 related fixes in ntp and aide rules #12548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6dd9a47
Fix maxpoll remediatian also for cases when maxpoll is negative
teacup-on-rockingchair Oct 27, 2024
6f4eee0
Fix bug with register ansible variable causing exception
teacup-on-rockingchair Oct 27, 2024
ea19d37
Remediate AIDE check in SLE via settings in crontab file
teacup-on-rockingchair Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion linux_os/guide/services/ntp/chronyd_or_ntpd_set_maxpoll/ansible/shared.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
- name: "{{{ rule_title }}} - Update the maxpoll Values in {{{ chrony_d_path }}}"
ansible.builtin.replace:
path: "{{ item.path }}"
regexp: '^((?:server|pool|peer).*maxpoll)[ ]+[0-9]+(.*)$'
regexp: '^((?:server|pool|peer).*maxpoll)[ ]+[0-9,-]+(.*)$'
replace: '\1 {{ var_time_service_set_maxpoll }}\2'
loop: '{{ chrony_d_conf_files.files }}'
when: chrony_d_conf_files.matched
Expand Down
2 changes: 1 addition & 1 deletion linux_os/guide/services/ntp/chronyd_or_ntpd_set_maxpoll/bash/shared.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $pof ntpd || {

for config_file in "${CONFIG_FILES[@]}" ; do
# Set maxpoll values to var_time_service_set_maxpoll
sed -i "s/^\(\(server\|pool\|peer\).*maxpoll\) [0-9][0-9]*\(.*\)$/\1 $var_time_service_set_maxpoll \3/" "$config_file"
sed -i "s/^\(\(server\|pool\|peer\).*maxpoll\) [0-9,-][0-9]*\(.*\)$/\1 $var_time_service_set_maxpoll \3/" "$config_file"
done

for config_file in "${CONFIG_FILES[@]}" ; do
Expand Down
2 changes: 1 addition & 1 deletion ...e/system/permissions/permissions_local/permissions_local_var_log_audit/ansible/shared.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
shell: >
set -o pipefail
chkstat --set --system
when: update_update_permissions_var_log_audit.changed
when: update_permissions_var_log_audit.changed

{{{ ansible_lineinfile(msg='Configure permission for /var/log/audit.log', path='/etc/permissions.local', regex='^\/var\/log\/audit\/audit.log\s+root.*', insensitive=false, new_line='/var/log/audit/audit.log root:root 600', create='yes', state='present', register='update_permissions_var_log_audit_audit_log') }}}

Expand Down
5 changes: 5 additions & 0 deletions ...software/integrity/software-integrity/aide/aide_periodic_cron_checking/ansible/shared.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@

- name: "{{{ rule_title }}}"
cron:
{{% if product in ["sle12", "sle15"] %}}
name: "{{{ rule_title }}}"
cron_file: /etc/crontab
{{% else %}}
name: "run AIDE check"
{{% endif %}}
minute: 05
hour: 04
weekday: 0
Expand Down
Loading