From a93ae59f08772c9b40efb9d7296561f3c880b456 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 6 Jul 2018 10:17:25 +0100
Subject: [PATCH 1/1] Apply memory limits to mapserv

---
 cookbooks/imagery/resources/layer.rb            | 2 ++
 cookbooks/systemd/resources/service.rb          | 3 +++
 cookbooks/systemd/templates/default/service.erb | 9 +++++++++
 3 files changed, 14 insertions(+)

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index 228839838..7da41f7bf 100644
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -70,6 +70,8 @@ action :create do
                 "MS_DEBUGLEVEL" => "0",
                 "MS_ERRORFILE" => "stderr"
     limit_nofile 16384
+    memory_high "1G"
+    memory_max "2G"
     user "imagery"
     group "imagery"
     exec_start_pre "/bin/rm -f /run/mapserver-fastcgi/layer-#{new_resource.layer}.socket"
diff --git a/cookbooks/systemd/resources/service.rb b/cookbooks/systemd/resources/service.rb
index eff763f32..c31b6d0bc 100644
--- a/cookbooks/systemd/resources/service.rb
+++ b/cookbooks/systemd/resources/service.rb
@@ -27,6 +27,9 @@ property :type, String,
          :default => "simple",
          :is => %w[simple forking oneshot dbus notify idle]
 property :limit_nofile, Integer
+property :memory_low, [Integer, String]
+property :memory_high, [Integer, String]
+property :memory_max, [Integer, String]
 property :environment, Hash, :default => {}
 property :environment_file, [String, Hash]
 property :user, String
diff --git a/cookbooks/systemd/templates/default/service.erb b/cookbooks/systemd/templates/default/service.erb
index f7f851ae5..b3e0c13e2 100644
--- a/cookbooks/systemd/templates/default/service.erb
+++ b/cookbooks/systemd/templates/default/service.erb
@@ -14,6 +14,15 @@ Type=<%= @type %>
 <% if @limit_nofile -%>
 LimitNOFILE=<%= @limit_nofile %>
 <% end -%>
+<% if @memory_low -%>
+MemoryLow=<%= @memory_low %>
+<% end -%>
+<% if @memory_high -%>
+MemoryHigh=<%= @memory_high %>
+<% end -%>
+<% if @memory_max -%>
+MemoryMax=<%= @memory_max %>
+<% end -%>
 <% @environment.each do |name,value| -%>
 Environment="<%= name %>=<%= value %>"
 <% end -%>
-- 
2.43.2