From 26b819f7d492f9a2d3a7b3c0ba61fdc4da953337 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Mon, 12 Sep 2022 21:33:51 +0200
Subject: [PATCH] chore: adjust config for rh9

---
 defaults/main.yml            | 26 +++++++++-----------------
 templates/etc/chrony.conf.j2 | 35 ++++++++++++++---------------------
 2 files changed, 23 insertions(+), 38 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 7f01ab6..749e6d8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,21 +1,13 @@
 ---
-chrony_port: 123
-chrony_acquisitionport: 1123
-chrony_allow: []
-
-chrony_conf_file: /etc/chrony/chrony.conf
-chrony_key_file: /etc/chrony/chrony.keys
-chrony_drift_file: /var/lib/chrony/drift
+chrony_pool: 2.pool.ntp.org iburst
+chrony_server: []
 
-# @var chrony_pool:default: $ "_unset_"
-chrony_server: "169.254.169.123 prefer iburst"
-
-chrony_log: "tracking measurements statistics"
-chrony_log_dir: /var/log/chrony
+chrony_allow: []
 
-chrony_maxupdateskew: 100.0
-chrony_dump_dir: /var/lib/chrony
+chrony_ntsdumpdir: /var/lib/chrony
 
-chrony_initstepslew_enabled: False
-chrony_initstepslew_threshold: 30
-chrony_initstepslew_servers: "169.254.169.123"
+chrony_logdir: /var/log/chrony
+chrony_log:
+  - measurements
+  - statistics
+  - tracking
diff --git a/templates/etc/chrony.conf.j2 b/templates/etc/chrony.conf.j2
index 30bd0d1..100f71b 100644
--- a/templates/etc/chrony.conf.j2
+++ b/templates/etc/chrony.conf.j2
@@ -1,33 +1,26 @@
 # {{ ansible_managed }}
 
-port {{ chrony_port }}
-acquisitionport {{ chrony_acquisitionport }}
-{% if chrony_pool is defined %}
+{% if chrony_server | default([]) | length == 0 %}
 pool {{ chrony_pool }}
 {% endif %}
-server {{ chrony_server }}
-
-keyfile {{ chrony_key_file }}
-commandkey 1
-
-driftfile {{ chrony_drift_file }}
-log {{ chrony_log }}
-logdir {{ chrony_log_dir }}
-maxupdateskew {{ chrony_maxupdateskew }}
-dumponexit
-
-dumpdir {{ chrony_dump_dir }}
-{% if chrony_initstepslew_enabled | bool %}
-initstepslew {{ chrony_initstepslew_threshold }} {{ chrony_initstepslew_servers }}
-{% endif %}
+{% for server in chrony_server %}
+server {{ item }}
+{% endfor %}
 
+sourcedir /run/chrony-dhcp
+driftfile /var/lib/chrony/drift
+makestep 1.0 3
+rtcsync
 {% if chrony_allow | length > 0 %}
+
 {% for block in chrony_allow %}
 allow {{ block }}
 {% endfor %}
 {% endif %}
 
-logchange 0.5
+keyfile /etc/chrony.keys
+ntsdumpdir {{ chrony_ntsdumpdir }}
+leapsectz right/UTC
 
-hwclockfile /etc/adjtime
-rtcsync
+logdir {{ chrony_logdir }}
+log {{ chrony_log | join(" ") }}