From 30f14e212cb62026b17b43cdda24587c570aff72 Mon Sep 17 00:00:00 2001 From: Javier Jardon Date: Fri, 17 Apr 2015 15:49:26 +0100 Subject: ntpd: Set default .service and conf file in the morphology file So we can avoid an specific extension to introduce it in the system Change-Id: I57f446977e3e5fba5fe98be6fdd6a3f150623f14 --- swift/etc/ntp.conf | 4 ++++ swift/manifest | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'swift') diff --git a/swift/etc/ntp.conf b/swift/etc/ntp.conf index b50886a4..54522871 100644 --- a/swift/etc/ntp.conf +++ b/swift/etc/ntp.conf @@ -19,3 +19,7 @@ server 3.pool.ntp.org iburst restrict -4 default kod notrap nomodify restrict -6 default kod notrap nomodify {% endif %} + +# The default rlimit isn't enough in some cases +# so we set a higher limit here +rlimit memlock 256 diff --git a/swift/manifest b/swift/manifest index 63ea2c2c..7fd76206 100644 --- a/swift/manifest +++ b/swift/manifest @@ -11,5 +11,5 @@ 0100644 0 0 /usr/share/swift/etc/rsyncd.j2 0100644 0 0 /usr/lib/systemd/system/swift-storage-setup.service 0100644 0 0 /usr/lib/systemd/system/swift-storage.service -template 0100644 0 0 /etc/ntp.conf +template overwrite 0100644 0 0 /etc/ntp.conf overwrite 0100644 0 0 /usr/lib/systemd/system/rsync.service -- cgit v1.2.1