diff options
| author | Javier Jardon <jjardon@gnome.org> | 2015-04-17 15:49:26 +0100 |
|---|---|---|
| committer | Baserock Gerrit <gerrit@baserock.org> | 2015-04-22 10:12:56 +0000 |
| commit | 30f14e212cb62026b17b43cdda24587c570aff72 (patch) | |
| tree | f8fa224cf318e9e4abbc631bb35eebd8ca6996a1 /swift | |
| parent | 70cf0464cf7ff98b7f6c843ffd076e21b5be75f9 (diff) | |
| download | definitions-30f14e212cb62026b17b43cdda24587c570aff72.tar.gz | |
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
Diffstat (limited to 'swift')
| -rw-r--r-- | swift/etc/ntp.conf | 4 | ||||
| -rw-r--r-- | swift/manifest | 2 |
2 files changed, 5 insertions, 1 deletions
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 |