Skip to content

Fix chronyd_server_directive #15105

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 4 commits into
base: master
Choose a base branch
from
Open

Fix chronyd_server_directive #15105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d9e669
Fix sed in chronyd_server_directive tests/
alanmcanonical Sep 9, 2026
c7ca395
Add mixed pool and server entries test case for chronyd_server_directive
alanmcanonical Sep 9, 2026
69de3ea
Fix oval regex
alanmcanonical Sep 9, 2026
c4db6a4
Suppress warning
alanmcanonical Sep 11, 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
2 changes: 1 addition & 1 deletion linux_os/guide/services/ntp/chronyd_server_directive/oval/shared.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<ind:textfilecontent54_object comment="Matches pool entries in Chrony conf files"
id="object_chronyd_no_pool_directive" version="1">
<ind:filepath operation="pattern match">{{{ filepath_regex }}}</ind:filepath>
<ind:pattern operation="pattern match">^[\s]+pool.*$</ind:pattern>
<ind:pattern operation="pattern match">^[\s]*pool.*$</ind:pattern>
<ind:instance datatype="int">1</ind:instance>
</ind:textfilecontent54_object>
</def-group>
7 changes: 7 additions & 0 deletions linux_os/guide/services/ntp/chronyd_server_directive/tests/mixed.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash
# packages = chrony
# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
Comment thread
alanmcanonical marked this conversation as resolved.
# remediation = none

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

sed -i "^pool.*" {{{ chrony_conf_path }}}
sed -i '/^pool.*/d' {{{ chrony_conf_path }}}
echo "server 0.pool.ntp.org" > {{{ chrony_conf_path }}}
echo "server 1.pool.ntp.org" >> {{{ chrony_conf_path }}}
2 changes: 1 addition & 1 deletion linux_os/guide/services/ntp/chronyd_server_directive/tests/only_pool.fail.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu
# remediation = none

sed -i "^server.*" {{{ chrony_conf_path }}}
sed -i '/^server.*/d' {{{ chrony_conf_path }}}
if ! grep "^pool.*" {{{ chrony_conf_path }}}; then
echo "pool 0.pool.ntp.org" > {{{ chrony_conf_path }}}
fi
2 changes: 1 addition & 1 deletion linux_os/guide/services/ntp/chronyd_server_directive/tests/only_server.pass.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
# packages = chrony
# platform = multi_platform_fedora,multi_platform_ol,multi_platform_rhel,multi_platform_almalinux,multi_platform_ubuntu

sed -i "^pool.*" {{{ chrony_conf_path }}}
sed -i '/^pool.*/d' {{{ chrony_conf_path }}}
echo "server 0.pool.ntp.org" > {{{ chrony_conf_path }}}
Loading