From 77707e37498d15d83cea45dcb3de055b5789b1df Mon Sep 17 00:00:00 2001
From: Guillem Jover <gjover@sipwise.com>
Date: Tue, 7 Apr 2020 16:01:18 +0200
Subject: [PATCH] TT#79157 Switch from ntpd to systemd-timesyncd

Change-Id: Id496c47f8c522393da5c0f738753d9cb2d92640a
---
 templates/200_user-debian.yaml.tt2          | 3 ---
 templates/400_process-debian.yaml.tt2       | 8 +++++---
 templates/500_init-daemons-dabian.yaml.tt2  | 6 +++---
 templates/820_network-ports-debian.yaml.tt2 | 5 ++---
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/templates/200_user-debian.yaml.tt2 b/templates/200_user-debian.yaml.tt2
index be2b871..ebdc8d0 100644
--- a/templates/200_user-debian.yaml.tt2
+++ b/templates/200_user-debian.yaml.tt2
@@ -9,9 +9,6 @@ group:
   mysql:
     exists: true
 
-  ntp:
-    exists: true
-
   prosody:
     exists: true
 
diff --git a/templates/400_process-debian.yaml.tt2 b/templates/400_process-debian.yaml.tt2
index 7af0fb6..bf2a5de 100644
--- a/templates/400_process-debian.yaml.tt2
+++ b/templates/400_process-debian.yaml.tt2
@@ -17,9 +17,6 @@ process:
   mysqld_safe:
     running: [% general.init_system == 'systemd' ? 'false' : 'true' %]
 
-  ntpd:
-    running: true
-
   redis-server:
     running: true
 
@@ -29,5 +26,10 @@ process:
   sshd:
     running: true
 
+  # XXX: We need to truncate the process name to 15 characters (from the
+  # actual "systemd-timesyncd"), which is the size of the comm string in Linux.
+  systemd-timesyn:
+    running: true
+
   systemd-udevd:
     running: true
diff --git a/templates/500_init-daemons-dabian.yaml.tt2 b/templates/500_init-daemons-dabian.yaml.tt2
index a4576d2..97272b2 100644
--- a/templates/500_init-daemons-dabian.yaml.tt2
+++ b/templates/500_init-daemons-dabian.yaml.tt2
@@ -45,15 +45,15 @@ service:
     enabled: true
     running: true
 
-  ntp.service:
+  rsyslog.service:
     enabled: true
     running: true
 
-  rsyslog.service:
+  ssh.service:
     enabled: true
     running: true
 
-  ssh.service:
+  systemd-timesyncd.service:
     enabled: true
     running: true
 
diff --git a/templates/820_network-ports-debian.yaml.tt2 b/templates/820_network-ports-debian.yaml.tt2
index f263c42..9f0b932 100644
--- a/templates/820_network-ports-debian.yaml.tt2
+++ b/templates/820_network-ports-debian.yaml.tt2
@@ -9,10 +9,9 @@ port:
     listening: true
     ip: ["127.0.0.1"]
 
-  # ntpd
+  # NTP (systemd-timesyncd does not listen)
   udp:123:
-    listening: true
-    ip: ["0.0.0.0"]
+    listening: false
 
   # Check for a closed port, nothing there.
   tcp:7777: