diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2015-04-28 13:10:58 +0000 |
|---|---|---|
| committer | Morph (on behalf of Adam Coldrick) <adam.coldrick@codethink.co.uk> | 2015-04-28 13:10:58 +0000 |
| commit | f398e6501b400f6c32fb4d1ba920ac41d09a9795 (patch) | |
| tree | 88183ce9240a52d78ce7784e18ca4d5a001c31a5 /swift | |
| parent | 888b2af4d841cf09fc8b8565a35f3484369f8aaa (diff) | |
| download | definitions-baserock/6453f312359f4317803ef7f14b58d21f/aff0f41a103e4d3cb83aaf9ed88359b2.tar.gz | |
Morph build deffc157ea9749848e5770b25da08214baserock/6453f312359f4317803ef7f14b58d21f/aff0f41a103e4d3cb83aaf9ed88359b2
System branch: master
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 |