From ca67feb39e98aebcb977f38c536800ee1ad09457 Mon Sep 17 00:00:00 2001 From: David Prevot Date: Thu, 24 Aug 2023 18:08:16 +0200 Subject: [PATCH] New timesyncd role used instead of ntpd by default --- evolinux-base/defaults/main.yml | 5 ++-- evolinux-base/tasks/system.yml | 5 ++++ timesyncd/defaults/main.yml | 3 ++ timesyncd/handlers/main.yml | 5 ++++ timesyncd/tasks/main.yml | 40 +++++++++++++++++++++++++++ timesyncd/templates/timesyncd.conf.j2 | 3 ++ 6 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 timesyncd/defaults/main.yml create mode 100644 timesyncd/handlers/main.yml create mode 100644 timesyncd/tasks/main.yml create mode 100644 timesyncd/templates/timesyncd.conf.j2 diff --git a/evolinux-base/defaults/main.yml b/evolinux-base/defaults/main.yml index e8894baf..1a7f8c11 100644 --- a/evolinux-base/defaults/main.yml +++ b/evolinux-base/defaults/main.yml @@ -104,7 +104,8 @@ evolinux_system_locales: True evolinux_system_set_timezone: True evolinux_system_timezone: "Europe/Paris" -evolinux_system_include_ntpd: true +evolinux_system_include_ntpd: False +evolinux_system_include_timesyncd: True evolinux_system_vim_skip_defaults: True evolinux_system_vim_default_editor: True @@ -233,4 +234,4 @@ evolinux_cron_checkhpraid_frequency: daily evolinux_motd_include: True # Utils -evolinux_utils_include: True \ No newline at end of file +evolinux_utils_include: True diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml index 67f4cc87..0f5fd825 100644 --- a/evolinux-base/tasks/system.yml +++ b/evolinux-base/tasks/system.yml @@ -134,6 +134,11 @@ when: - evolinux_system_include_ntpd | bool +- ansible.builtin.include_role: + name: evolix/timesyncd + when: + - evolinux_system_include_timesyncd | bool + ## alert5 - name: Install alert5 init script (jessie/stretch) diff --git a/timesyncd/defaults/main.yml b/timesyncd/defaults/main.yml new file mode 100644 index 00000000..7fb5bcf4 --- /dev/null +++ b/timesyncd/defaults/main.yml @@ -0,0 +1,3 @@ +--- +ntp_servers: +- 'ntp.evolix.net' diff --git a/timesyncd/handlers/main.yml b/timesyncd/handlers/main.yml new file mode 100644 index 00000000..904e3471 --- /dev/null +++ b/timesyncd/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: Restart timesyncd + ansible.builtin.service: + name: systemd-timesyncd.service + state: restarted diff --git a/timesyncd/tasks/main.yml b/timesyncd/tasks/main.yml new file mode 100644 index 00000000..2efad13e --- /dev/null +++ b/timesyncd/tasks/main.yml @@ -0,0 +1,40 @@ +--- +- name: Install systemd-timesyncd package + ansible.builtin.apt: + name: systemd-timesyncd + state: present + tags: + - timesyncd + +- name: Remove openntpd package + ansible.builtin.apt: + name: openntpd + state: absent + tags: + - timesyncd + +- name: Remove ntp package + ansible.builtin.apt: + name: ntp + state: absent + tags: + - timesyncd + +- name: Ensure /etc/systemd/timesyncd.conf.d directory exists + file: + path: /etc/systemd/timesyncd.conf.d + state: directory + mode: "755" + owner: root + group: root + tags: + - timesyncd + +- name: Copy timesyncd config + ansible.builtin.template: + src: timesyncd.conf.j2 + dest: /etc/systemd/timesyncd.conf.d/evolix.conf + mode: "0644" + notify: Restart timesyncd + tags: + - timesyncd diff --git a/timesyncd/templates/timesyncd.conf.j2 b/timesyncd/templates/timesyncd.conf.j2 new file mode 100644 index 00000000..93d22569 --- /dev/null +++ b/timesyncd/templates/timesyncd.conf.j2 @@ -0,0 +1,3 @@ +# {{ ansible_managed }} +[Time] +NTP="{{ ntp_servers | join(' ') }}"