Skip to content

Fix chronyd_specify_remote_server remediation #15100

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

Open
alanmcanonical wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fix chronyd_specify_remote_server remediation #15100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3f578b2
Move the logic of checking existance inside for loop for bash_ensure_…
alanmcanonical Sep 7, 2026
7ecb211
Change remediation to append if not exist
alanmcanonical Sep 7, 2026
10ee941
Drop grep suppress flag
alanmcanonical Sep 7, 2026
c32cd47
Skip chronyd conf dir tests on Ubuntu
alanmcanonical Sep 7, 2026
51648e8
Remove indent
alanmcanonical Sep 8, 2026
b1b679e
Dot escaping
alanmcanonical Sep 8, 2026
e21e7fd
Wrapped {{{ servers_list }}} in double quotes and prevent read from i…
alanmcanonical Sep 8, 2026
acc6073
Add escape test case
alanmcanonical Sep 8, 2026
f6dea80
Comment out invalid server lines
alanmcanonical Sep 8, 2026
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
6 changes: 4 additions & 2 deletions linux_os/guide/services/ntp/chronyd_specify_remote_server/bash/shared.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

config_file="{{{ chrony_conf_path }}}"

if ! grep -q '^[[:space:]]*\(server\|pool\)[[:space:]]\+[[:graph:]]\+' "$config_file" ; then
{{{ bash_ensure_there_are_servers_in_ntp_compatible_config_file("$config_file", "$var_multiple_time_servers") | indent(2) }}}
if [[ ! -f $config_file ]]; then
touch "$config_file"
fi

{{{ bash_ensure_there_are_servers_in_ntp_compatible_config_file("$config_file", "$var_multiple_time_servers") }}}
2 changes: 1 addition & 1 deletion linux_os/guide/services/ntp/chronyd_specify_remote_server/tests/confdir.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# packages = chrony
# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux

# Test: server directive in confdir .conf file
CONF_DIR="/etc/chrony/conf.d"
Expand Down
9 changes: 9 additions & 0 deletions linux_os/guide/services/ntp/chronyd_specify_remote_server/tests/escape_dot.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash
# packages = chrony
# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
# variables = var_multiple_time_servers=0.pool.ntp.org,1.pool.ntp.org

rm -rf /etc/chrony/conf.d
rm -rf /etc/chrony/sources.d

echo "server 0xpool-ntp-org" > {{{ chrony_conf_path }}}
2 changes: 1 addition & 1 deletion linux_os/guide/services/ntp/chronyd_specify_remote_server/tests/multiple_sourcedir.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# packages = chrony
# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux

# Test: Multiple sourcedir declarations, server in second directory
SOURCES_DIR1="/etc/chrony/sources1.d"
Expand Down
2 changes: 1 addition & 1 deletion linux_os/guide/services/ntp/chronyd_specify_remote_server/tests/sourcedir.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# packages = chrony
# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux

# Test: server directive in sourcedir .sources file
SOURCES_DIR="/etc/chrony/sources.d"
Expand Down
27 changes: 21 additions & 6 deletions shared/macros/10-bash.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,13 +741,28 @@ fi

#}}
{{%- macro bash_ensure_there_are_servers_in_ntp_compatible_config_file(config_file, servers_list) -%}}
if ! grep -q '#[[:space:]]*server' "{{{ config_file }}}" ; then
for server in $(echo "{{{ servers_list }}}" | tr ',' '\n') ; do
printf '\nserver %s' "$server" >> "{{{ config_file }}}"
done
else
sed -i 's/#[ \t]*server/server/g' "{{{ config_file }}}"
IFS="," read -r -a SERVERS <<< "{{{ servers_list }}}"

valid_pattern=""
for server in "${SERVERS[@]}"; do
escaped_server="${server//./\\.}"
if [ -z "$valid_pattern" ]; then
valid_pattern="${escaped_server}"
else
valid_pattern="${valid_pattern}|${escaped_server}"
fi
done

if [ -n "$valid_pattern" ]; then
sed -i -E "/^[[:space:]]*server[[:space:]]/ { /^[[:space:]]*server[[:space:]]+(${valid_pattern})([[:space:]]|$)/! s/^[[:space:]]*server/# server/ }" "{{{ config_file }}}"
fi

for server in "${SERVERS[@]}" ; do
escaped_server="${server//./\\.}"
if ! grep -q "^[[:space:]]*server[[:space:]]\+${escaped_server}\([[:space:]]\|$\)" "{{{ config_file }}}" ; then
printf '\nserver %s' "$server" >> "{{{ config_file }}}"
fi
done
{{{ bash_ensure_nl_at_eof(config_file) }}}
{{%- endmacro -%}}

Expand Down
Loading