Skip to content

Commit b4b1453

Browse files
committed
Use ntp (instead of systemd-timesyncd) on Ubuntu 18.04
Seems like Ubuntu 18.04 does not have a dedicated `systemd-timesyncd` package, nor does it include the `systemd-timesyncd` binary in the main `systemd` package. Fixes spantaleev#1302 Regression since spantaleev#1192
1 parent 1c8ec8d commit b4b1453

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

roles/matrix-base/defaults/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ matrix_host_command_openssl: "/usr/bin/env openssl"
8383
matrix_host_command_systemctl: "/usr/bin/env systemctl"
8484
matrix_host_command_sh: "/usr/bin/env sh"
8585

86-
matrix_ntpd_package: "{{ 'systemd-timesyncd' if (ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '16') else 'ntp' }}"
87-
matrix_ntpd_service: "{{ 'systemd-timesyncd' if (ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '16') or ansible_distribution == 'Archlinux' else ('ntpd' if ansible_os_family == 'RedHat' else 'ntp') }}"
86+
matrix_ntpd_package: "{{ 'systemd-timesyncd' if (ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '18') else 'ntp' }}"
87+
matrix_ntpd_service: "{{ 'systemd-timesyncd' if (ansible_distribution == 'CentOS' and ansible_distribution_major_version > '7') or (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version > '18') or ansible_distribution == 'Archlinux' else ('ntpd' if ansible_os_family == 'RedHat' else 'ntp') }}"
8888

8989
matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"
9090

0 commit comments

Comments
 (0)